fixed wx 2.5 figsize bug

jdh2358 · jdh2358 · commit 6a47b931f9ba · 2005-04-12T14:46:01.000Z
svn path=/trunk/matplotlib/; revision=1164
diff --git a/examples/embedding_in_wx4.py b/examples/embedding_in_wx4.py
@@ -104,6 +104,7 @@ def __init__(self):
 
     def OnPaint(self, event):
         self.canvas.draw()
+        event.Skip()
         
 class App(wxApp):
     
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -142,7 +142,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.74'
+__version__  = '0.80'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 
@@ -307,9 +307,15 @@ def _get_data_path():
     # C:\Python23\share\matplotlib into your dist dir.  See
     # http://starship.python.net/crew/theller/moin.cgi/MatPlotLib
     # for more info
-    if sys.platform=='win32' and sys.frozen:
-        path = os.path.join(os.path.split(sys.path[0])[0], 'matplotlibdata')
-        return path
+
+    if sys.platform=='win32' and sys.frozen: 
+        path = os.path.join(os.path.split(sys.path[0])[0], 'matplotlibdata') 
+        if os.path.isdir(path):  return path 
+        else:
+            # Try again assuming sys.path[0] is a dir not a exe 
+            path = os.path.join(sys.path[0], 'matplotlibdata') 
+            if os.path.isdir(path): return path
+
     raise RuntimeError('Could not find the matplotlib data files')
 
 get_data_path = verbose.wrap('matplotlib data path %s', _get_data_path, always=False)
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1216,8 +1216,10 @@ def __init__(self, num, fig):
             pos = wx.DefaultPosition
         else:
             pos =wx.Point(20,20)
+        l,b,w,h = fig.bbox.get_bounds()
         wx.Frame.__init__(self, parent=None, id=-1, pos=pos,
-                          title="Figure %d" % num)
+                          title="Figure %d" % num,
+                          size=(w,h))
         DEBUG_MSG("__init__()", 1, self)
         self.num = num
 
