Patches from KevinO that work around issues where the widget isn't

fully created yet.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/lib/floatcanvas.py b/wxPython/wx/lib/floatcanvas.py
index 79481c9977276dba87efaa3853571e46a9db5e9f..0df12ea34c2c0d67843fa26446d496773893fc61 100644 (file)
--- a/wxPython/wx/lib/floatcanvas.py
+++ b/wxPython/wx/lib/floatcanvas.py
@@ -799,7 +799,8 @@ class FloatCanvas(wx.Panel):
         self.StartMove = None
         self.PrevMoveBox = None
         # called just to make sure everything is initialized
         self.StartMove = None
         self.PrevMoveBox = None
         # called just to make sure everything is initialized

-        self.OnSize(None)
+        if wx.Platform != "__WXMAC__":
+               self.OnSize(None)

 
         
     def BuildToolbar(self):
 
         
     def BuildToolbar(self):

diff --git a/wxPython/wx/lib/plot.py b/wxPython/wx/lib/plot.py
index 7b8535945f86e0b55584620d628ee0dd5a9860be..946b5bdf2859c16d59bbc0247501c97db0c63491 100644 (file)
--- a/wxPython/wx/lib/plot.py
+++ b/wxPython/wx/lib/plot.py
@@ -392,9 +392,6 @@ class PlotCanvas(wx.Window):
 
         self.SetBackgroundColour("white")
         
 
         self.SetBackgroundColour("white")
         

-        self.Bind(wx.EVT_PAINT, self.OnPaint)
-        self.Bind(wx.EVT_SIZE, self.OnSize)
-        

         # Create some mouse events for zooming
         self.Bind(wx.EVT_LEFT_DOWN, self.OnMouseLeftDown)
         self.Bind(wx.EVT_LEFT_UP, self.OnMouseLeftUp)
         # Create some mouse events for zooming
         self.Bind(wx.EVT_LEFT_DOWN, self.OnMouseLeftDown)
         self.Bind(wx.EVT_LEFT_UP, self.OnMouseLeftUp)


@@ -439,10 +436,13 @@ class PlotCanvas(wx.Window):
         self._fontSizeTitle= 15
         self._fontSizeLegend= 7
 
         self._fontSizeTitle= 15
         self._fontSizeLegend= 7
 

+        self.Bind(wx.EVT_PAINT, self.OnPaint)
+        self.Bind(wx.EVT_SIZE, self.OnSize)

         # OnSize called to make sure the buffer is initialized.
         # This might result in OnSize getting called twice on some
         # platforms at initialization, but little harm done.
         # OnSize called to make sure the buffer is initialized.
         # This might result in OnSize getting called twice on some
         # platforms at initialization, but little harm done.

-        self.OnSize(None) # sets the initial size based on client size
+               if wx.Platform != "__WXMAC__":
+                   self.OnSize(None) # sets the initial size based on client size

 
         
     # SaveFile
 
         
     # SaveFile