Initial work transitioning to wxWidgets 2.9.

m_shiftDown -> shiftDown in wxWidgets 2.9.0.1 [1]
NamedColor alias for NamedColour removed in in wxWidgets [version?] [2]

[1]: http://www.wxpython.org/recentchanges.php
[2]: http://svn.wxwidgets.org/viewvc/wx/wxPython/trunk/src/gtk/_gdi.py?r1=52881&r2=53838&pathrev=53838

diff --git a/hooke/ui/gui/__init__.py b/hooke/ui/gui/__init__.py
index fc417178ec9c567447eb99d0fb2872a7dc112047..809b30c3975c29dc53f0327e9660d506635fe9c4 100644 (file)
--- a/hooke/ui/gui/__init__.py
+++ b/hooke/ui/gui/__init__.py
@@ -20,7 +20,7 @@
 
 """
 
 
 """
 

-WX_GOOD=['2.8']
+WX_GOOD=['2.9', '2.8']

 
 import wxversion
 wxversion.select(WX_GOOD)
 
 import wxversion
 wxversion.select(WX_GOOD)

diff --git a/hooke/ui/gui/panel/plot.py b/hooke/ui/gui/panel/plot.py
index dc09084090cc7a2d2ce7007041387b3a02448b4b..dbf7cd8d2c40789cebfab98eb48ba75a0fe8fc7f 100644 (file)
--- a/hooke/ui/gui/panel/plot.py
+++ b/hooke/ui/gui/panel/plot.py
@@ -117,7 +117,7 @@ class PlotPanel (Panel, wx.Panel):
         self._c['canvas'] = FigureCanvas(
             parent=self, id=wx.ID_ANY, figure=self._c['figure'])
 
         self._c['canvas'] = FigureCanvas(
             parent=self, id=wx.ID_ANY, figure=self._c['figure'])
 

-        self._set_color(wx.NamedColor('WHITE'))
+        self._set_color(wx.NamedColour('WHITE'))

         sizer = wx.BoxSizer(wx.VERTICAL)
         sizer.Add(self._c['canvas'], 1, wx.LEFT | wx.TOP | wx.GROW)
         self._setup_toolbar(sizer=sizer)  # comment out to remove plot toolbar.
         sizer = wx.BoxSizer(wx.VERTICAL)
         sizer.Add(self._c['canvas'], 1, wx.LEFT | wx.TOP | wx.GROW)
         self._setup_toolbar(sizer=sizer)  # comment out to remove plot toolbar.


@@ -215,7 +215,7 @@ class PlotPanel (Panel, wx.Panel):
 
     def _on_mouse_move(self, event):
         if 'toolbar' in self._c:
 
     def _on_mouse_move(self, event):
         if 'toolbar' in self._c:

-            if event.guiEvent.m_shiftDown:
+            if event.guiEvent.shiftDown:

                 self._c['toolbar'].set_cursor(wx.CURSOR_RIGHT_ARROW)
             else:
                 self._c['toolbar'].set_cursor(wx.CURSOR_ARROW)
                 self._c['toolbar'].set_cursor(wx.CURSOR_RIGHT_ARROW)
             else:
                 self._c['toolbar'].set_cursor(wx.CURSOR_ARROW)