Clear toolbars only in Figure

stanleyjs · stanleyjs · commit 9dfcfd534bb2 · 2022-01-07T08:40:10.000-06:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -956,9 +956,6 @@ def clf(self, keep_observers=False):
             ax.cla()
             self.delaxes(ax)  # Remove ax from self._axstack.
 
-        toolbar = getattr(self.canvas, 'toolbar', None)
-        if toolbar is not None:
-            toolbar.update()
         self.artists = []
         self.subfigs = []
         self.lines = []
@@ -2783,7 +2780,19 @@ def set_figheight(self, val, forward=True):
         """
         self.set_size_inches(self.get_figwidth(), val, forward=forward)
 
+    def clf(self, keep_observers=False):
+        """
+        Clear the figure.
 
+        Set *keep_observers* to True if, for example,
+        a gui widget is tracking the Axes in the figure.
+        """
+        super().clf(keep_observers=keep_observers)
+        # FigureBase.clf does not clear toolbars, as 
+        # only Figure can have toolbars
+        toolbar = getattr(self.canvas, 'toolbar', None)
+        if toolbar is not None:
+            toolbar.update()
 
     @_finalize_rasterization
     @allow_rasterization
