Merged the wxPy_newswig branch into the HEAD branch (main trunk)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-12 21:34:20 +00:00
parent eb6a4098a0
commit d14a1e2856
987 changed files with 671143 additions and 783083 deletions
--- a/wxPython/demo/wxFileHistory.py
+++ b/wxPython/demo/wxFileHistory.py
@@ -30,7 +30,7 @@ class TestPanel(wxPanel):
        box.Add(t, 0, wxCENTER|wxALL, 5)

        box.Add(wxStaticLine(self, -1), 0, wxEXPAND)
-        box.Add(10,20)
+        box.Add((10,20))

        t = wxStaticText(self, -1, text)
        t.SetFont(nf)