Merge pull request #18605 from anntzer/wxtb

dopplershift · web-flow · commit 0daf9d761244 · 2020-09-29T11:41:47.000-06:00
Correctly sync state of wx toolbar buttons when triggered by keyboard.
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1179,12 +1179,14 @@ def get_canvas(self, frame, fig):
         return type(self.canvas)(frame, -1, fig)
 
     def zoom(self, *args):
-        self.ToggleTool(self.wx_ids['Pan'], False)
-        NavigationToolbar2.zoom(self, *args)
+        tool = self.wx_ids['Zoom']
+        self.ToggleTool(tool, not self.GetToolState(tool))
+        super().zoom(*args)
 
     def pan(self, *args):
-        self.ToggleTool(self.wx_ids['Zoom'], False)
-        NavigationToolbar2.pan(self, *args)
+        tool = self.wx_ids['Pan']
+        self.ToggleTool(tool, not self.GetToolState(tool))
+        super().pan(*args)
 
     def save_figure(self, *args):
         # Fetch the required filename and file type.
