Changeset 5251ec6 in sasview for src/sas/sasgui/plottools/toolbar.py

Timestamp:

Oct 11, 2018 2:20:56 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

98b9f32

Parents:

67ed543

Message:

improved support for py37 in sasgui

File:

• src/sas/sasgui/plottools/toolbar.py (modified) (1 diff)

src/sas/sasgui/plottools/toolbar.py

@@ -65 +65 @@
                            'Forward', 'Forward navigation view')
         # todo: get new bitmap
-        self.AddCheckTool(self._NTB2_PAN, _load_bitmap('move.png'),
-                          shortHelp='Pan',
-                          longHelp='Pan with left, zoom with right')
-        self.AddCheckTool(self._NTB2_ZOOM, _load_bitmap('zoom_to_rect.png'),
-                          shortHelp='Zoom', longHelp='Zoom to rectangle')
+        # todo: update with code from matplotlib/backends/backend_wx.py
+        is_phoenix = 'phoenix' in wx.PlatformInfo
+        if is_phoenix: # wx phoenix >= 4.0.0b2
+            self.AddCheckTool(self._NTB2_PAN, "Pan", _load_bitmap('move.png'),
+                              shortHelp='Pan',
+                              longHelp='Pan with left, zoom with right')
+            self.AddCheckTool(self._NTB2_ZOOM, "Zoom", _load_bitmap('zoom_to_rect.png'),
+                              shortHelp='Zoom', longHelp='Zoom to rectangle')
+        else:
+            self.AddCheckTool(self._NTB2_PAN, _load_bitmap('move.png'),
+                              shortHelp='Pan',
+                              longHelp='Pan with left, zoom with right')
+            self.AddCheckTool(self._NTB2_ZOOM, _load_bitmap('zoom_to_rect.png'),
+                              shortHelp='Zoom', longHelp='Zoom to rectangle')
 
         self.AddSeparator()