Fix bug in TkAgg backend opening/closing multiple figure windows when interactive: True.

mdboom · mdboom · commit f60df9f8afb4 · 2011-06-23T11:01:16.000-04:00
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -176,6 +176,7 @@ class FigureCanvasTkAgg(FigureCanvasAgg):
     def __init__(self, figure, master=None, resize_callback=None):
         FigureCanvasAgg.__init__(self, figure)
         self._idle = True
+        self._idle_callback = None
         t1,t2,w,h = self.figure.bbox.bounds
         w, h = int(w), int(h)
         self._tkcanvas = Tk.Canvas(
@@ -263,7 +264,8 @@ def idle_draw(*args):
             self.draw()
             self._idle = True
 
-        if d: self._tkcanvas.after_idle(idle_draw)
+        if d:
+            self._idle_callback = self._tkcanvas.after_idle(idle_draw)
 
     def get_tk_widget(self):
         """returns the Tk widget used to implement FigureCanvasTkAgg.
@@ -454,13 +456,15 @@ def destroy(*args):
 
 
     def destroy(self, *args):
-        if Gcf.get_num_fig_managers()==0 and not matplotlib.is_interactive():
-            if self.window is not None:
-                self.window.quit()
         if self.window is not None:
             #self.toolbar.destroy()
+            if self.canvas._idle_callback:
+                self.canvas._tkcanvas.after_cancel(self.canvas._idle_callback)
             self.window.destroy()
-            self.window = None
+        if Gcf.get_num_fig_managers()==0:
+            if self.window is not None:
+                self.window.quit()
+        self.window = None
 
     def set_window_title(self, title):
         self.window.wm_title(title)
