Merge remote-tracking branch 'upstream/v1.0.x-maint'

efiring · efiring · commit 850f097d1f38 · 2011-08-18T09:27:13.000-10:00
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -548,14 +548,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 \
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -230,8 +230,8 @@ def resize(self, event):
 
         self._tkcanvas.delete(self._tkphoto)
         self._tkphoto = Tk.PhotoImage(
-            master=self._tkcanvas, width=width, height=height)
-        self._tkcanvas.create_image(width/2,height/2,image=self._tkphoto)
+            master=self._tkcanvas, width=int(width), height=int(height))
+        self._tkcanvas.create_image(int(width/2),int(height/2),image=self._tkphoto)
         self.resize_event()
         self.show()
 
@@ -545,7 +545,7 @@ def __init__(self, canvas, window):
         xmin, xmax = canvas.figure.bbox.intervalx
         height, width = 50, xmax-xmin
         Tk.Frame.__init__(self, master=self.window,
-                          width=width, height=height,
+                          width=int(width), height=int(height),
                           borderwidth=2)
 
         self.update()  # Make axes menu
@@ -701,7 +701,7 @@ def _init_toolbar(self):
         xmin, xmax = self.canvas.figure.bbox.intervalx
         height, width = 50, xmax-xmin
         Tk.Frame.__init__(self, master=self.window,
-                          width=width, height=height,
+                          width=int(width), height=int(height),
                           borderwidth=2)
 
         self.update()  # Make axes menu
