fix issues preventing startup and unit test execution

Author: Janne Härkönen

src/robotide/__init__.py

@@ -39,8 +39,8 @@
 try:
     import wxversion
     from wxversion import VersionError
-    if sys.platform == 'darwin':
-        supported_versions.append("2.9")
+    if sys.platform == 'darwin': # CAN NOT IMPORT IS_MAC AS THERE IS A wx IMPORT
+        supported_versions.append("3.0")
     wxversion.select(supported_versions)
     import wx
 except ImportError as e:

src/robotide/publish/__init__.py

@@ -119,6 +119,11 @@ def important_action(self):
 
 import os
 
+from robotide.context import WX_VERSION
+if WX_VERSION > '3.0':
+    from wx.lib.pubsub import setuparg1
+elif WX_VERSION > '2.9':
+    from wx.lib.pubsub import setupv1
 from messages import *
 from publisher import PUBLISHER
 

src/robotide/publish/messages.py

@@ -12,6 +12,12 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+try:
+    from wx.lib.pubsub import Publisher
+    WxPublisher = Publisher()
+except ImportError:
+    from wx.lib.pubsub import pub
+    WxPublisher = pub.getDefaultPublisher()
 import inspect
 import sys
 import traceback

src/robotide/publish/publisher.py

@@ -12,6 +12,13 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+try:
+    from wx.lib.pubsub import Publisher
+    WxPublisher = Publisher()
+except ImportError:
+    from wx.lib.pubsub import pub
+    WxPublisher = pub.getDefaultPublisher()
+
 
 class Publisher(object):
 
@@ -67,6 +74,7 @@ class _ListenerWrapper(object):
     def __init__(self, listener, topic):
         self.listener = listener
         self.topic = self._get_topic(topic)
+        WxPublisher.subscribe(self, self.topic)
 
     def _get_topic(self, topic):
         if not isinstance(topic, basestring):
@@ -80,7 +88,7 @@ def listens(self, topic):
         return self._get_topic(topic).startswith(self.topic)
 
     def unsubscribe(self):
-        pass
+        WxPublisher.unsubscribe(self, self.topic)
 
     def __call__(self, data):
         from messages import RideLogException

src/robotide/ui/tree.py

@@ -15,6 +15,10 @@
 import wx
 from wx.lib.agw import customtreectrl
 from wx.lib.mixins import treemixin
+try:
+    from wx import ColorRGB as Colour
+except ImportError:
+    from wx import Colour
 
 from robotide.controller.ui.treecontroller import TreeController, \
     TestSelectionController
@@ -283,7 +287,7 @@ def _create_node_with_handler(self, parent_node, controller, index=None):
                                  index, with_checkbox=(handler_class == TestCaseHandler and self._checkboxes_for_tests))
         if isinstance(controller, ResourceFileController):
             if not controller.is_used():
-                self.SetItemTextColour(node, wx.ColorRGB(0xA9A9A9))
+                self.SetItemTextColour(node, Colour(0xA9, 0xA9, 0xA9))
         self.SetPyData(node, handler_class(controller, self, node, self._controller.settings))
         if controller.is_excluded():
             self._set_item_excluded(node)