Merged revisions 5211,5213 via svnmerge from

jdh2358 · jdh2358 · commit 0e543d62788b · 2008-05-22T14:32:56.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint ........ r5211 | mdboom | 2008-05-21 08:06:51 -0500 (Wed, 21 May 2008) | 2 lines Backport TkAgg segfault fix. ........ r5213 | jdh2358 | 2008-05-22 09:21:10 -0500 (Thu, 22 May 2008) | 1 line applied stans wx figsize patch ........ svn path=/trunk/matplotlib/; revision=5214
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2008-05-21 Fix segfault in TkAgg backend - MGD
+
 2008-05-21 Fix a "local variable unreferenced" bug in plotfile - MM
 
 2008-05-19 Fix crash when Windows can not access the registry to
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1226,14 +1226,15 @@ def __init__(self, num, fig):
             pos =wx.Point(20,20)
         l,b,w,h = fig.bbox.bounds
         wx.Frame.__init__(self, parent=None, id=-1, pos=pos,
-                          title="Figure %d" % num,
-                          size=(w,h))
+                          title="Figure %d" % num)
+        # Frame will be sized later by the Fit method
         DEBUG_MSG("__init__()", 1, self)
         self.num = num
 
         statbar = StatusBarWx(self)
         self.SetStatusBar(statbar)
         self.canvas = self.get_canvas(fig)
+        self.canvas.SetInitialSize(wx.Size(fig.bbox.width(), fig.bbox.height()))
         self.sizer =wx.BoxSizer(wx.VERTICAL)
         self.sizer.Add(self.canvas, 1, wx.TOP | wx.LEFT | wx.EXPAND)
         # By adding toolbar in sizer, we are able to put it at the bottom
@@ -1352,6 +1353,11 @@ def destroy(self, *args):
     def set_window_title(self, title):
         self.window.SetTitle(title)
 
+    def resize(self, width, height)
+        'Set the canvas size in pixels'
+        self.canvas.SetInitialSize(wx.Size(width, height))
+        self.window.GetSizer().Fit(self.window)
+
 # Identifiers for toolbar controls - images_wx contains bitmaps for the images
 # used in the controls. wxWindows does not provide any stock images, so I've
 # 'stolen' those from GTK2, and transformed them into the appropriate format.
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -414,6 +414,7 @@ def set_size_inches(self, *args, **kwargs):
         from the shell
 
         WARNING: forward=True is broken on all backends except GTK*
+        and WX*
 
         ACCEPTS: a w,h tuple with w,h in inches
         """

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2008-05-21 Fix segfault in TkAgg backend - MGD`
	`2`	`+`
`1`	`3`	`2008-05-21 Fix a "local variable unreferenced" bug in plotfile - MM`
`2`	`4`
`3`	`5`	`2008-05-19 Fix crash when Windows can not access the registry to`