SF.net SVN: matplotlib:[6810] trunk/matplotlib

[<ef...@us...>]

Revision: 6810
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6810&view=rev
Author:   efiring
Date:     2009-01-19 18:11:35 +0000 (Mon, 19 Jan 2009)

Log Message:
-----------
Merged 6809 from v0_98_5_maint

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6805
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6809
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009-01-19 18:06:15 UTC (rev 6809)
+++ trunk/matplotlib/CHANGELOG	2009-01-19 18:11:35 UTC (rev 6810)
@@ -1,3 +1,5 @@
+2009-01-19 Fix bug in backend_gtk: don't delete nonexistent toolbar. - EF
+
 2009-01-16 Implement bbox_inches option for savefig. If bbox_inches is
            "tight", try to determine the tight bounding box. - JJL
 

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2009-01-19 18:06:15 UTC (rev 6809)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2009-01-19 18:11:35 UTC (rev 6810)
@@ -489,7 +489,8 @@
         self.vbox.destroy()
         self.window.destroy()
         self.canvas.destroy()
-        self.toolbar.destroy()
+        if self.toolbar:
+            self.toolbar.destroy()
         self.__dict__.clear()
 
         if Gcf.get_num_fig_managers()==0 and \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.