Merge pull request #22339 from anntzer/wxapp

timhoffm · web-flow · commit c6bad8c14b59 · 2022-01-28T08:43:16.000+01:00
wx.App() should be init'ed in new_figure_manager_given_figure
diff --git a/lib/matplotlib/backends/backend_template.py b/lib/matplotlib/backends/backend_template.py
@@ -158,17 +158,17 @@ def show(*, block=None):
 
 def new_figure_manager(num, *args, FigureClass=Figure, **kwargs):
     """Create a new figure manager instance."""
-    # If a main-level app must be created, this (and
-    # new_figure_manager_given_figure) is the usual place to do it -- see
-    # backend_wx, backend_wxagg and backend_tkagg for examples.  Not all GUIs
-    # require explicit instantiation of a main-level app (e.g., backend_gtk3)
-    # for pylab.
     thisFig = FigureClass(*args, **kwargs)
     return new_figure_manager_given_figure(num, thisFig)
 
 
 def new_figure_manager_given_figure(num, figure):
     """Create a new figure manager instance for the given figure."""
+    # If a main-level app must be created, this is the usual place to do it
+    # -- see the wx and tk backends for examples (the default implementation
+    # of new_figure_manager defers to new_figure_manager_given_figure, so it
+    # also benefits from this instantiation).  Not all GUIs require explicit
+    # instantiation of a main-level app (e.g., backend_gtk3) for pylab.
     canvas = FigureCanvasTemplate(figure)
     manager = FigureManagerTemplate(canvas, num)
     return manager
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1356,7 +1356,7 @@ class _BackendWx(_Backend):
     FigureManager = FigureManagerWx
 
     @classmethod
-    def new_figure_manager(cls, num, *args, **kwargs):
+    def new_figure_manager_given_figure(cls, num, figure):
         # Create a wx.App instance if it has not been created so far.
         wxapp = wx.GetApp()
         if wxapp is None:
@@ -1366,10 +1366,6 @@ def new_figure_manager(cls, num, *args, **kwargs):
             # Retain a reference to the app object so that it does not get
             # garbage collected.
             _BackendWx._theWxApp = wxapp
-        return super().new_figure_manager(num, *args, **kwargs)
-
-    @classmethod
-    def new_figure_manager_given_figure(cls, num, figure):
         frame = FigureFrameWx(num, figure, canvas_class=cls.FigureCanvas)
         figmgr = frame.get_figure_manager()
         if mpl.is_interactive():
