Merge pull request #12861 from anntzer/wxnewid

DietmarSchwertberger · web-flow · commit 898fbaafadc3 · 2018-12-01T20:07:27.000+01:00
Don't use deprecated wx.NewId().
diff --git a/examples/user_interfaces/embedding_in_wx4_sgskip.py b/examples/user_interfaces/embedding_in_wx4_sgskip.py
@@ -17,19 +17,16 @@
 
 
 class MyNavigationToolbar(NavigationToolbar):
-    """
-    Extend the default wx toolbar with your own event handlers
-    """
-    ON_CUSTOM = wx.NewId()
+    """Extend the default wx toolbar with your own event handlers."""
 
     def __init__(self, canvas, cankill):
         NavigationToolbar.__init__(self, canvas)
 
         # for simplicity I'm going to reuse a bitmap from wx, you'll
         # probably want to add your own.
-        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)
+        tool = self.AddTool(wx.ID_ANY, 'Click me', _load_bitmap('back.png'),
+                            'Activate custom contol')
+        self.Bind(wx.EVT_TOOL, self._on_custom, id=tool.GetId())
 
     def _on_custom(self, evt):
         # add some text to the axes in a random location in axes (0,1)
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -713,11 +713,10 @@ def start_event_loop(self, timeout=0):
         """
         if hasattr(self, '_event_loop'):
             raise RuntimeError("Event loop already running")
-        id = wx.NewId()
-        timer = wx.Timer(self, id=id)
+        timer = wx.Timer(self, id=wx.ID_ANY)
         if timeout > 0:
             timer.Start(timeout * 1000, oneShot=True)
-            self.Bind(wx.EVT_TIMER, self.stop_event_loop, id=id)
+            self.Bind(wx.EVT_TIMER, self.stop_event_loop, id=timer.GetId())
 
         # Event loop handler for start/stop event loop
         self._event_loop = wx.GUIEventLoop()
@@ -1292,26 +1291,6 @@ def resize(self, width, height):
         self.canvas.SetInitialSize(wx.Size(width, height))
         self.window.GetSizer().Fit(self.window)
 
-# Identifiers for toolbar controls - images_wx contains bitmaps for the images
-# used in the controls. wxWindows does not provide any stock images, so I've
-# 'stolen' those from GTK2, and transformed them into the appropriate format.
-# import images_wx
-
-
-_NTB_AXISMENU = wx.NewId()
-_NTB_AXISMENU_BUTTON = wx.NewId()
-_NTB_X_PAN_LEFT = wx.NewId()
-_NTB_X_PAN_RIGHT = wx.NewId()
-_NTB_X_ZOOMIN = wx.NewId()
-_NTB_X_ZOOMOUT = wx.NewId()
-_NTB_Y_PAN_UP = wx.NewId()
-_NTB_Y_PAN_DOWN = wx.NewId()
-_NTB_Y_ZOOMIN = wx.NewId()
-_NTB_Y_ZOOMOUT = wx.NewId()
-# _NTB_SUBPLOT            =wx.NewId()
-_NTB_SAVE = wx.NewId()
-_NTB_CLOSE = wx.NewId()
-
 
 def _load_bitmap(filename):
     """
@@ -1355,7 +1334,7 @@ class MenuButtonWx(wx.Button):
 
     def __init__(self, parent):
 
-        wx.Button.__init__(self, parent, _NTB_AXISMENU_BUTTON, "Axes:        ",
+        wx.Button.__init__(self, parent, wx.ID_ANY, "Axes:        ",
                            style=wx.BU_EXACTFIT)
         self._toolbar = parent
         self._menu = wx.Menu()
@@ -1368,7 +1347,7 @@ def __init__(self, parent):
                           False)
         self._menu.AppendSeparator()
 
-        self.Bind(wx.EVT_BUTTON, self._onMenuButton, id=_NTB_AXISMENU_BUTTON)
+        self.Bind(wx.EVT_BUTTON, self._onMenuButton, id=self.GetId())
         self.Bind(wx.EVT_MENU, self._handleSelectAllAxes, id=self._allId)
         self.Bind(wx.EVT_MENU, self._handleInvertAxesSelected,
                   id=self._invertId)
