Merge pull request #22750 from QuLogic/auto-backport-of-pr-22743-on-v3.5.x

oscargus · web-flow · commit 9c603cc4323a · 2022-04-01T14:03:27.000+02:00
Backport PR #22743: Fix configure_subplots with tool manager
diff --git a/lib/matplotlib/backends/_backend_gtk.py b/lib/matplotlib/backends/_backend_gtk.py
@@ -156,8 +156,7 @@ def _get_canvas(self, fig):
         return self.canvas.__class__(fig)
 
     def trigger(self, *args):
-        _NavigationToolbar2GTK.configure_subplots(
-            self._make_classic_style_pseudo_toolbar(), None)
+        _NavigationToolbar2GTK.configure_subplots(self, None)
 
 
 class _BackendGTK(_Backend):
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -995,9 +995,12 @@ def set_message(self, s):
 
 
 class ConfigureSubplotsQt(backend_tools.ConfigureSubplotsBase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._subplot_dialog = None
+
     def trigger(self, *args):
-        NavigationToolbar2QT.configure_subplots(
-            self._make_classic_style_pseudo_toolbar())
+        NavigationToolbar2QT.configure_subplots(self)
 
 
 class SaveFigureQt(backend_tools.SaveFigureBase):
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1294,8 +1294,7 @@ def set_message(self, s):
 
 class ConfigureSubplotsWx(backend_tools.ConfigureSubplotsBase):
     def trigger(self, *args):
-        NavigationToolbar2Wx.configure_subplots(
-            self._make_classic_style_pseudo_toolbar())
+        NavigationToolbar2Wx.configure_subplots(self)
 
 
 class SaveFigureWx(backend_tools.SaveFigureBase):
