merge from 2.8 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-07 16:24:56 +00:00
parent 9c49977bd6
commit 3c69a2ec86
21 changed files with 169 additions and 816 deletions
--- a/wxPython/wxaddons/sized_controls.py
+++ b/wxPython/wxaddons/sized_controls.py
@@ -576,4 +576,4 @@ class SizedFrame(wx.Frame):
        self.SetAutoLayout(True)
        
    def GetContentsPane(self):
-        return self.mainPanel
+        return self.mainPanel