Merge pull request #11608 from anntzer/wxphoenix

timhoffm · web-flow · commit 550dad46ccd2 · 2018-07-09T21:14:50.000+02:00
Remove some conditional branches in examples for wx&lt;4.
diff --git a/examples/user_interfaces/embedding_in_wx4_sgskip.py b/examples/user_interfaces/embedding_in_wx4_sgskip.py
@@ -27,15 +27,9 @@ def __init__(self, canvas, cankill):
 
         # for simplicity I'm going to reuse a bitmap from wx, you'll
         # probably want to add your own.
-        if 'phoenix' in wx.PlatformInfo:
-            self.AddTool(self.ON_CUSTOM, 'Click me',
-                         _load_bitmap('back.png'),
-                         'Activate custom contol')
-            self.Bind(wx.EVT_TOOL, self._on_custom, id=self.ON_CUSTOM)
-        else:
-            self.AddSimpleTool(self.ON_CUSTOM, _load_bitmap('back.png'),
-                               'Click me', 'Activate custom contol')
-            self.Bind(wx.EVT_TOOL, self._on_custom, id=self.ON_CUSTOM)
+        self.AddTool(self.ON_CUSTOM, 'Click me', _load_bitmap('back.png'),
+                     'Activate custom contol')
+        self.Bind(wx.EVT_TOOL, self._on_custom, id=self.ON_CUSTOM)
 
     def _on_custom(self, evt):
         # add some text to the axes in a random location in axes (0,1)
diff --git a/examples/user_interfaces/embedding_in_wx5_sgskip.py b/examples/user_interfaces/embedding_in_wx5_sgskip.py
@@ -6,13 +6,9 @@
 """
 
 import wx
+import wx.lib.agw.aui as aui
 import wx.lib.mixins.inspection as wit
 
-if 'phoenix' in wx.PlatformInfo:
-    import wx.lib.agw.aui as aui
-else:
-    import wx.aui as aui
-
 import matplotlib as mpl
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
 from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as NavigationToolbar
