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/wxJoystick.py
+++ b/wxPython/demo/wxJoystick.py
@@ -7,7 +7,7 @@ from joystick_wdr import *

 class JoystickTestPanel(wxPanel):
    def __init__(self, parent, id,
-        pos = wxPyDefaultPosition, size = wxPyDefaultSize,
+        pos = wxDefaultPosition, size = wxDefaultSize,
        style = wxTAB_TRAVERSAL ):
        wxPanel.__init__(self, parent, id, pos, size, style)