wx/wxagg emmleak fixes

jdh2358 · jdh2358 · commit 18204b0ba6b6 · 2005-01-17T18:05:04.000Z
svn path=/trunk/matplotlib/; revision=868
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 New entries should be added at the top
 
+2005-01-17 Cleaned up Destroy handling in wx reducing memleak/fig from
+           approx 800k to approx 6k- JDH
+
 2005-01-17 Added kappa to latex_to_bakoma - JDH
 
 2005-01-15 Support arbitrary colorbar axes and horizontal colorbars - JDH
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -715,6 +715,10 @@ def __init__(self, parent, id, figure):
         
         self.Printer_Init()
 
+    def Destroy(self, *args, **kwargs):
+        wxPanel.Destroy(self, *args, **kwargs)
+        
+        
     def Copy_to_Clipboard(self, event=None):
         "copy bitmap of canvas to system clipboard"
         bmp_obj = wx.BitmapDataObject()
@@ -1240,7 +1244,12 @@ def _onClose(self, evt):
     def GetToolBar(self):
         """Override wxFrame::GetToolBar as we don't have managed toolbar"""
         return self.toolbar
-    
+
+    def Destroy(self, *args, **kwargs):
+        wxFrame.Destroy(self, *args, **kwargs)
+        if self.toolbar is not None:
+            self.toolbar.Destroy()
+            
 class FigureManagerWx(FigureManagerBase):
     """
     This class contains the FigureCanvas and GUI frame
@@ -1270,6 +1279,8 @@ def notify_axes_change(fig):
     def destroy(self, *args):
         DEBUG_MSG("destroy()", 1, self)
         self.frame.Destroy()
+        self.canvas.Destroy()        
+        #if self.tb is not None: self.tb.Destroy()
         import wx
         #wx.GetApp().ProcessIdle()
         wx.WakeUpIdle()
diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py
@@ -49,7 +49,6 @@ def draw(self):
         Render the figure using agg
         """
         DEBUG_MSG("draw()", 1, self)
-
         FigureCanvasAgg.draw(self)
         s = self.tostring_rgb()  
         w = int(self.renderer.width)
diff --git a/unit/memleak_hawaii3.py b/unit/memleak_hawaii3.py
@@ -4,7 +4,7 @@
 import matplotlib
 matplotlib.interactive(True)
 #matplotlib.use('Cairo')
-matplotlib.use('TkAgg')
+matplotlib.use('WXAgg')
 from pylab import *
 
 
@@ -36,6 +36,7 @@ def report_memory(i):
     pcolor(10*rand(50,50))
     ion()
     draw()
+
     #ioff()
     #savefig('tmp%d' % i, dpi = 75)
     #fd = file('tmp%d' % i, 'wb')
