Merge pull request #388 from efiring/gtk_no_toolbar

efiring · efiring · commit 05b4e4c3d88d · 2011-07-02T13:56:56.000-07:00
Gtk no toolbar
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -547,14 +547,14 @@ def notify_axes_change(fig):
 
     def destroy(self, *args):
         if _debug: print 'FigureManagerGTK.%s' % fn_name()
+        if hasattr(self, 'toolbar') and self.toolbar is not None:
+            self.toolbar.destroy()
         if hasattr(self, 'vbox'):
             self.vbox.destroy()
         if hasattr(self, 'window'):
             self.window.destroy()
         if hasattr(self, 'canvas'):
             self.canvas.destroy()
-        if hasattr(self, 'toolbar'):
-            self.toolbar.destroy()
         self.__dict__.clear()   #Is this needed? Other backends don't have it.
 
         if Gcf.get_num_fig_managers()==0 and \
