Simplify wxframe deletion.

anntzer · anntzer · commit 0a3698509c79 · 2022-01-29T16:33:39.000+01:00
Instead of reimplementing Destroy and fiddling around with supercalls
and IsBeingDeleted, move the toolbar disconnection to the _on_close
handler (which anyways already unregisters the figure from Gcf, so it's
definitely going to destroy the figure) and inherit Destroy from the
base class.
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -937,24 +937,13 @@ def _on_close(self, event):
         self.figmgr.frame = None
         # remove figure manager from Gcf.figs
         Gcf.destroy(self.figmgr)
+        try:  # See issue 2941338.
+            self.canvas.mpl_disconnect(self.canvas.toolbar._id_drag)
+        except AttributeError:  # If there's no toolbar.
+            pass
         # Carry on with close event propagation, frame & children destruction
         event.Skip()
 
-    def Destroy(self, *args, **kwargs):
-        try:
-            self.canvas.mpl_disconnect(self.canvas.manager.toolbar._id_drag)
-            # Rationale for line above: see issue 2941338.
-        except AttributeError:
-            pass  # classic toolbar lacks the attribute
-        # The "if self" check avoids a "wrapped C/C++ object has been deleted"
-        # RuntimeError at exit with e.g.
-        # MPLBACKEND=wxagg python -c 'from pylab import *; plot()'.
-        if self and not self.IsBeingDeleted():
-            super().Destroy(*args, **kwargs)
-            # toolbar.Destroy() should not be necessary if the close event is
-            # allowed to propagate.
-        return True
-
 
 class FigureManagerWx(FigureManagerBase):
     """
