Merge #3 from the 2.6 branch, containing last set of changes before

the 2.6.2 release. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 21:09:57 +00:00
parent f533e26f39
commit 486afba9a4
13 changed files with 146 additions and 73 deletions
--- a/wxPython/wx/lib/floatcanvas/FloatCanvas.py
+++ b/wxPython/wx/lib/floatcanvas/FloatCanvas.py
@@ -1905,7 +1905,7 @@ class FloatCanvas(wx.Panel):
        self.ObjectUnderMouse = None
        
        # called just to make sure everything is initialized
-        self.OnSize(None)
+        ##self.OnSize(None)

        self.InHereNum = 0