Forward port recent changes on the 2.8 branch to HEAD

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-05-16 23:39:42 +00:00
parent f6342fb5e6
commit 0b0849b5a5
87 changed files with 3807 additions and 1586 deletions

View File

@@ -457,10 +457,21 @@ class SizedPanel(wx.PyPanel):
self.sizerType = "vertical"
def AddChild(self, child):
wx.PyPanel.base_AddChild(self, child)
if wx.VERSION < (2,8):
wx.PyPanel.base_AddChild(self, child)
else:
wx.PyPanel.AddChild(self, child)
# Note: The wx.LogNull is used here to suppress a log message
# on wxMSW that happens because when AddChild is called the
# widget's hwnd hasn't been set yet, so the GetWindowRect that
# happens as a result of sizer.Add (in wxSizerItem::SetWindow)
# fails. A better fix would be to defer this code somehow
# until after the child widget is fully constructed.
sizer = self.GetSizer()
nolog = wx.LogNull()
item = sizer.Add(child)
del nolog
item.SetUserData({"HGrow":0, "VGrow":0})
# Note: One problem is that the child class given to AddChild