X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c127177f8dc31dbe99764852b8dbcc047d3ad826..661dc384df649f673d06fa1038e343cf263932af:/utils/wxPython/src/msw/windows.cpp

diff --git a/utils/wxPython/src/msw/windows.cpp b/utils/wxPython/src/msw/windows.cpp
index 3491b5b589..8a1cbf660a 100644
--- a/utils/wxPython/src/msw/windows.cpp
+++ b/utils/wxPython/src/msw/windows.cpp
@@ -317,7 +317,7 @@ static PyObject *_wrap_wxWindow_CaptureMouse(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_Center(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
-    int  _arg1 = (wxHORIZONTAL);
+    int  _arg1 = (wxBOTH);
     char * _argc0 = 0;
 
     self = self;
@@ -343,7 +343,7 @@ static PyObject *_wrap_wxWindow_Center(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
-    int  _arg1 = (wxHORIZONTAL);
+    int  _arg1 = (wxBOTH);
     char * _argc0 = 0;
 
     self = self;
@@ -365,6 +365,58 @@ static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxWindow_CentreOnParent(_swigobj,_swigarg0)  (_swigobj->CentreOnParent(_swigarg0))
+static PyObject *_wrap_wxWindow_CentreOnParent(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    int  _arg1 = (wxBOTH);
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s|i:wxWindow_CentreOnParent",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_CentreOnParent. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_CentreOnParent(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxWindow_CenterOnParent(_swigobj,_swigarg0)  (_swigobj->CenterOnParent(_swigarg0))
+static PyObject *_wrap_wxWindow_CenterOnParent(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    int  _arg1 = (wxBOTH);
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s|i:wxWindow_CenterOnParent",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_CenterOnParent. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_CenterOnParent(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxWindow_ClientToScreenXY(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ClientToScreen(_swigarg0,_swigarg1))
 static PyObject *_wrap_wxWindow_ClientToScreenXY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -850,33 +902,6 @@ static PyObject *_wrap_wxWindow_GetConstraints(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxWindow_GetDefaultItem(_swigobj)  (_swigobj->GetDefaultItem())
-static PyObject *_wrap_wxWindow_GetDefaultItem(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxButton * _result;
-    wxWindow * _arg0;
-    char * _argc0 = 0;
-    char _ptemp[128];
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetDefaultItem",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetDefaultItem. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-{
-    wxPy_BEGIN_ALLOW_THREADS;
-        _result = (wxButton *)wxWindow_GetDefaultItem(_arg0);
-
-    wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxButton_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
-    return _resultobj;
-}
-
 #define wxWindow_GetFont(_swigobj)  (_swigobj->GetFont())
 static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -1014,6 +1039,44 @@ static PyObject *_wrap_wxWindow_GetLabel(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxWindow_SetLabel(_swigobj,_swigarg0)  (_swigobj->SetLabel(_swigarg0))
+static PyObject *_wrap_wxWindow_SetLabel(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxWindow_SetLabel",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetLabel. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetLabel(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
 #define wxWindow_GetName(_swigobj)  (_swigobj->GetName())
 static PyObject *_wrap_wxWindow_GetName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -1170,31 +1233,6 @@ static PyObject *_wrap_wxWindow_GetRect(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxWindow_GetReturnCode(_swigobj)  (_swigobj->GetReturnCode())
-static PyObject *_wrap_wxWindow_GetReturnCode(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    int  _result;
-    wxWindow * _arg0;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetReturnCode",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetReturnCode. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-{
-    wxPy_BEGIN_ALLOW_THREADS;
-        _result = (int )wxWindow_GetReturnCode(_arg0);
-
-    wxPy_END_ALLOW_THREADS;
-}    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
 #define wxWindow_GetScrollThumb(_swigobj,_swigarg0)  (_swigobj->GetScrollThumb(_swigarg0))
 static PyObject *_wrap_wxWindow_GetScrollThumb(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -1519,6 +1557,33 @@ static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxWindow_GetUpdateRegion(_swigobj)  (_swigobj->GetUpdateRegion())
+static PyObject *_wrap_wxWindow_GetUpdateRegion(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxRegion * _result;
+    wxWindow * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxWindow_GetUpdateRegion",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetUpdateRegion. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxRegion (wxWindow_GetUpdateRegion(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRegion_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
 #define wxWindow_GetWindowStyleFlag(_swigobj)  (_swigobj->GetWindowStyleFlag())
 static PyObject *_wrap_wxWindow_GetWindowStyleFlag(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -1544,6 +1609,31 @@ static PyObject *_wrap_wxWindow_GetWindowStyleFlag(PyObject *self, PyObject *arg
     return _resultobj;
 }
 
+#define wxWindow_Hide(_swigobj)  (_swigobj->Hide())
+static PyObject *_wrap_wxWindow_Hide(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxWindow * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxWindow_Hide",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Hide. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_Hide(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 #define wxWindow_InitDialog(_swigobj)  (_swigobj->InitDialog())
 static PyObject *_wrap_wxWindow_InitDialog(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -1644,6 +1734,31 @@ static PyObject *_wrap_wxWindow_IsShown(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxWindow_IsTopLevel(_swigobj)  (_swigobj->IsTopLevel())
+static PyObject *_wrap_wxWindow_IsTopLevel(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxWindow * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxWindow_IsTopLevel",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsTopLevel. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_IsTopLevel(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 #define wxWindow_Layout(_swigobj)  (_swigobj->Layout())
 static PyObject *_wrap_wxWindow_Layout(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -1836,8 +1951,8 @@ static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxWindow_PopupMenu(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->PopupMenu(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
+#define wxWindow_PopupMenuXY(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->PopupMenu(_swigarg0,_swigarg1,_swigarg2))
+static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
@@ -1848,7 +1963,42 @@ static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
     char * _argc1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ssii:wxWindow_PopupMenu",&_argc0,&_argc1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"ssii:wxWindow_PopupMenuXY",&_argc0,&_argc1,&_arg2,&_arg3)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_PopupMenuXY. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenu_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_PopupMenuXY. Expected _wxMenu_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_PopupMenuXY(_arg0,_arg1,_arg2,_arg3);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxWindow_PopupMenu(_swigobj,_swigarg0,_swigarg1)  (_swigobj->PopupMenu(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxWindow * _arg0;
+    wxMenu * _arg1;
+    wxPoint * _arg2;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char * _argc2 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sss:wxWindow_PopupMenu",&_argc0,&_argc1,&_argc2)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
@@ -1862,9 +2012,15 @@ static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxWindow_PopupMenu. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
 {
     wxPy_BEGIN_ALLOW_THREADS;
-        _result = (bool )wxWindow_PopupMenu(_arg0,_arg1,_arg2,_arg3);
+        _result = (bool )wxWindow_PopupMenu(_arg0,_arg1,*_arg2);
 
     wxPy_END_ALLOW_THREADS;
 }    _resultobj = Py_BuildValue("i",_result);
@@ -1957,6 +2113,39 @@ static PyObject *_wrap_wxWindow_ReleaseMouse(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxWindow_Reparent(_swigobj,_swigarg0)  (_swigobj->Reparent(_swigarg0))
+static PyObject *_wrap_wxWindow_Reparent(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxWindow * _arg0;
+    wxWindow * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxWindow_Reparent",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Reparent. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_Reparent. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_Reparent(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 #define wxWindow_ScreenToClientXY(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ScreenToClient(_swigarg0,_swigarg1))
 static PyObject *_wrap_wxWindow_ScreenToClientXY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -2203,34 +2392,6 @@ static PyObject *_wrap_wxWindow_SetConstraints(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxWindow_SetDoubleClick(_swigobj,_swigarg0)  (_swigobj->SetDoubleClick(_swigarg0))
-static PyObject *_wrap_wxWindow_SetDoubleClick(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxWindow * _arg0;
-    bool  _arg1;
-    char * _argc0 = 0;
-    int tempbool1;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"si:wxWindow_SetDoubleClick",&_argc0,&tempbool1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetDoubleClick. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-    _arg1 = (bool ) tempbool1;
-{
-    wxPy_BEGIN_ALLOW_THREADS;
-        wxWindow_SetDoubleClick(_arg0,_arg1);
-
-    wxPy_END_ALLOW_THREADS;
-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
 #define wxWindow_SetFocus(_swigobj)  (_swigobj->SetFocus())
 static PyObject *_wrap_wxWindow_SetFocus(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -2386,32 +2547,6 @@ static PyObject *_wrap_wxWindow_SetName(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxWindow_SetReturnCode(_swigobj,_swigarg0)  (_swigobj->SetReturnCode(_swigarg0))
-static PyObject *_wrap_wxWindow_SetReturnCode(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxWindow * _arg0;
-    int  _arg1;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"si:wxWindow_SetReturnCode",&_argc0,&_arg1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetReturnCode. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-{
-    wxPy_BEGIN_ALLOW_THREADS;
-        wxWindow_SetReturnCode(_arg0,_arg1);
-
-    wxPy_END_ALLOW_THREADS;
-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
 #define wxWindow_SetScrollbar(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->SetScrollbar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
 static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -3191,6 +3326,66 @@ static PyObject *_wrap_wxPanel_InitDialog(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxPanel_GetDefaultItem(_swigobj)  (_swigobj->GetDefaultItem())
+static PyObject *_wrap_wxPanel_GetDefaultItem(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxButton * _result;
+    wxPanel * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxPanel_GetDefaultItem",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPanel_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPanel_GetDefaultItem. Expected _wxPanel_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxButton *)wxPanel_GetDefaultItem(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxButton_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxPanel_SetDefaultItem(_swigobj,_swigarg0)  (_swigobj->SetDefaultItem(_swigarg0))
+static PyObject *_wrap_wxPanel_SetDefaultItem(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxPanel * _arg0;
+    wxButton * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxPanel_SetDefaultItem",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPanel_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPanel_SetDefaultItem. Expected _wxPanel_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxButton_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPanel_SetDefaultItem. Expected _wxButton_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxPanel_SetDefaultItem(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 static void *SwigwxDialogTowxPanel(void *ptr) {
     wxDialog *src;
     wxPanel *dest;
@@ -3553,6 +3748,65 @@ static PyObject *_wrap_wxDialog_ShowModal(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxDialog_GetReturnCode(_swigobj)  (_swigobj->GetReturnCode())
+static PyObject *_wrap_wxDialog_GetReturnCode(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxDialog * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxDialog_GetReturnCode",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_GetReturnCode. Expected _wxDialog_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxDialog_GetReturnCode(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxDialog_SetReturnCode(_swigobj,_swigarg0)  (_swigobj->SetReturnCode(_swigarg0))
+static PyObject *_wrap_wxDialog_SetReturnCode(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxDialog * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxDialog_SetReturnCode",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetReturnCode. Expected _wxDialog_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxDialog_SetReturnCode(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+static void *SwigwxScrolledWindowTowxPanel(void *ptr) {
+    wxScrolledWindow *src;
+    wxPanel *dest;
+    src = (wxScrolledWindow *) ptr;
+    dest = (wxPanel *) src;
+    return (void *) dest;
+}
+
 static void *SwigwxScrolledWindowTowxWindow(void *ptr) {
     wxScrolledWindow *src;
     wxWindow *dest;
@@ -3905,16 +4159,17 @@ static void *SwigwxMenuTowxEvtHandler(void *ptr) {
     return (void *) dest;
 }
 
-#define new_wxMenu(_swigarg0) (new wxMenu(_swigarg0))
+#define new_wxMenu(_swigarg0,_swigarg1) (new wxMenu(_swigarg0,_swigarg1))
 static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMenu * _result;
     wxString * _arg0 = &wxPyEmptyStr;
+    long  _arg1 = 0;
     PyObject * _obj0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|O:new_wxMenu",&_obj0)) 
+    if(!PyArg_ParseTuple(args,"|Ol:new_wxMenu",&_obj0,&_arg1)) 
         return NULL;
     if (_obj0)
 {
@@ -3926,7 +4181,7 @@ static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args) {
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
-        _result = (wxMenu *)new_wxMenu(*_arg0);
+        _result = (wxMenu *)new_wxMenu(*_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
 }    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
@@ -4520,79 +4775,32 @@ static PyObject *_wrap_wxMenu_SetLabel(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static void *SwigwxPyMenuTowxMenu(void *ptr) {
-    wxPyMenu *src;
-    wxMenu *dest;
-    src = (wxPyMenu *) ptr;
-    dest = (wxMenu *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxPyMenuTowxEvtHandler(void *ptr) {
-    wxPyMenu *src;
-    wxEvtHandler *dest;
-    src = (wxPyMenu *) ptr;
-    dest = (wxEvtHandler *) src;
-    return (void *) dest;
-}
-
-#define new_wxPyMenu(_swigarg0,_swigarg1) (new wxPyMenu(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxPyMenu(PyObject *self, PyObject *args) {
+#define wxMenu_UpdateUI(_swigobj,_swigarg0)  (_swigobj->UpdateUI(_swigarg0))
+static PyObject *_wrap_wxMenu_UpdateUI(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
-    wxPyMenu * _result;
-    wxString * _arg0 = &wxPyEmptyStr;
-    PyObject * _arg1 = NULL;
-    PyObject * _obj0 = 0;
-    PyObject * _obj1 = 0;
-    char _ptemp[128];
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"|OO:new_wxPyMenu",&_obj0,&_obj1)) 
-        return NULL;
-    if (_obj0)
-{
-    if (!PyString_Check(_obj0)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
-}
-    if (_obj1)
-{
-  _arg1 = _obj1;
-}
-{
-    wxPy_BEGIN_ALLOW_THREADS;
-        _result = (wxPyMenu *)new_wxPyMenu(*_arg0,_arg1);
-
-    wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyMenu_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
-{
-    if (_obj0)
-        delete _arg0;
-}
-    return _resultobj;
-}
-
-#define delete_wxPyMenu(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxPyMenu(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxPyMenu * _arg0;
+    wxMenu * _arg0;
+    wxEvtHandler * _arg1 = NULL;
     char * _argc0 = 0;
+    char * _argc1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxPyMenu",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s|s:wxMenu_UpdateUI",&_argc0,&_argc1)) 
         return NULL;
     if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyMenu_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPyMenu. Expected _wxPyMenu_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_UpdateUI. Expected _wxMenu_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxEvtHandler_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenu_UpdateUI. Expected _wxEvtHandler_p.");
         return NULL;
         }
     }
 {
     wxPy_BEGIN_ALLOW_THREADS;
-        delete_wxPyMenu(_arg0);
+        wxMenu_UpdateUI(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
 }    Py_INCREF(Py_None);
@@ -5937,8 +6145,7 @@ static PyMethodDef windowscMethods[] = {
 	 { "wxMenuBar_Check", _wrap_wxMenuBar_Check, 1 },
 	 { "wxMenuBar_Append", _wrap_wxMenuBar_Append, 1 },
 	 { "new_wxMenuBar", _wrap_new_wxMenuBar, 1 },
-	 { "delete_wxPyMenu", _wrap_delete_wxPyMenu, 1 },
-	 { "new_wxPyMenu", _wrap_new_wxPyMenu, 1 },
+	 { "wxMenu_UpdateUI", _wrap_wxMenu_UpdateUI, 1 },
 	 { "wxMenu_SetLabel", _wrap_wxMenu_SetLabel, 1 },
 	 { "wxMenu_IsEnabled", _wrap_wxMenu_IsEnabled, 1 },
 	 { "wxMenu_IsChecked", _wrap_wxMenu_IsChecked, 1 },
@@ -5966,6 +6173,8 @@ static PyMethodDef windowscMethods[] = {
 	 { "wxScrolledWindow_GetScrollPixelsPerUnit", _wrap_wxScrolledWindow_GetScrollPixelsPerUnit, 1 },
 	 { "wxScrolledWindow_EnableScrolling", _wrap_wxScrolledWindow_EnableScrolling, 1 },
 	 { "new_wxScrolledWindow", _wrap_new_wxScrolledWindow, 1 },
+	 { "wxDialog_SetReturnCode", _wrap_wxDialog_SetReturnCode, 1 },
+	 { "wxDialog_GetReturnCode", _wrap_wxDialog_GetReturnCode, 1 },
 	 { "wxDialog_ShowModal", _wrap_wxDialog_ShowModal, 1 },
 	 { "wxDialog_Show", _wrap_wxDialog_Show, 1 },
 	 { "wxDialog_SetTitle", _wrap_wxDialog_SetTitle, 1 },
@@ -5977,6 +6186,8 @@ static PyMethodDef windowscMethods[] = {
 	 { "wxDialog_EndModal", _wrap_wxDialog_EndModal, 1 },
 	 { "wxDialog_Centre", _wrap_wxDialog_Centre, 1 },
 	 { "new_wxDialog", _wrap_new_wxDialog, 1 },
+	 { "wxPanel_SetDefaultItem", _wrap_wxPanel_SetDefaultItem, 1 },
+	 { "wxPanel_GetDefaultItem", _wrap_wxPanel_GetDefaultItem, 1 },
 	 { "wxPanel_InitDialog", _wrap_wxPanel_InitDialog, 1 },
 	 { "new_wxPanel", _wrap_new_wxPanel, 1 },
 	 { "wxWindow_GetToolTip", _wrap_wxWindow_GetToolTip, 1 },
@@ -6003,13 +6214,11 @@ static PyMethodDef windowscMethods[] = {
 	 { "wxWindow_SetDimensions", _wrap_wxWindow_SetDimensions, 1 },
 	 { "wxWindow_SetScrollPos", _wrap_wxWindow_SetScrollPos, 1 },
 	 { "wxWindow_SetScrollbar", _wrap_wxWindow_SetScrollbar, 1 },
-	 { "wxWindow_SetReturnCode", _wrap_wxWindow_SetReturnCode, 1 },
 	 { "wxWindow_SetName", _wrap_wxWindow_SetName, 1 },
 	 { "wxWindow_SetId", _wrap_wxWindow_SetId, 1 },
 	 { "wxWindow_SetForegroundColour", _wrap_wxWindow_SetForegroundColour, 1 },
 	 { "wxWindow_SetFont", _wrap_wxWindow_SetFont, 1 },
 	 { "wxWindow_SetFocus", _wrap_wxWindow_SetFocus, 1 },
-	 { "wxWindow_SetDoubleClick", _wrap_wxWindow_SetDoubleClick, 1 },
 	 { "wxWindow_SetConstraints", _wrap_wxWindow_SetConstraints, 1 },
 	 { "wxWindow_SetBackgroundColour", _wrap_wxWindow_SetBackgroundColour, 1 },
 	 { "wxWindow_SetAutoLayout", _wrap_wxWindow_SetAutoLayout, 1 },
@@ -6017,21 +6226,26 @@ static PyMethodDef windowscMethods[] = {
 	 { "wxWindow_ScrollWindow", _wrap_wxWindow_ScrollWindow, 1 },
 	 { "wxWindow_ScreenToClient", _wrap_wxWindow_ScreenToClient, 1 },
 	 { "wxWindow_ScreenToClientXY", _wrap_wxWindow_ScreenToClientXY, 1 },
+	 { "wxWindow_Reparent", _wrap_wxWindow_Reparent, 1 },
 	 { "wxWindow_ReleaseMouse", _wrap_wxWindow_ReleaseMouse, 1 },
 	 { "wxWindow_Refresh", _wrap_wxWindow_Refresh, 1 },
 	 { "wxWindow_Raise", _wrap_wxWindow_Raise, 1 },
 	 { "wxWindow_PopupMenu", _wrap_wxWindow_PopupMenu, 1 },
+	 { "wxWindow_PopupMenuXY", _wrap_wxWindow_PopupMenuXY, 1 },
 	 { "wxWindow_Move", _wrap_wxWindow_Move, 1 },
 	 { "wxWindow_MoveXY", _wrap_wxWindow_MoveXY, 1 },
 	 { "wxWindow_MakeModal", _wrap_wxWindow_MakeModal, 1 },
 	 { "wxWindow_Lower", _wrap_wxWindow_Lower, 1 },
 	 { "wxWindow_LoadFromResource", _wrap_wxWindow_LoadFromResource, 1 },
 	 { "wxWindow_Layout", _wrap_wxWindow_Layout, 1 },
+	 { "wxWindow_IsTopLevel", _wrap_wxWindow_IsTopLevel, 1 },
 	 { "wxWindow_IsShown", _wrap_wxWindow_IsShown, 1 },
 	 { "wxWindow_IsRetained", _wrap_wxWindow_IsRetained, 1 },
 	 { "wxWindow_IsEnabled", _wrap_wxWindow_IsEnabled, 1 },
 	 { "wxWindow_InitDialog", _wrap_wxWindow_InitDialog, 1 },
+	 { "wxWindow_Hide", _wrap_wxWindow_Hide, 1 },
 	 { "wxWindow_GetWindowStyleFlag", _wrap_wxWindow_GetWindowStyleFlag, 1 },
+	 { "wxWindow_GetUpdateRegion", _wrap_wxWindow_GetUpdateRegion, 1 },
 	 { "wxWindow_GetTitle", _wrap_wxWindow_GetTitle, 1 },
 	 { "wxWindow_GetFullTextExtent", _wrap_wxWindow_GetFullTextExtent, 1 },
 	 { "wxWindow_GetTextExtent", _wrap_wxWindow_GetTextExtent, 1 },
@@ -6040,18 +6254,17 @@ static PyMethodDef windowscMethods[] = {
 	 { "wxWindow_GetScrollRange", _wrap_wxWindow_GetScrollRange, 1 },
 	 { "wxWindow_GetScrollPos", _wrap_wxWindow_GetScrollPos, 1 },
 	 { "wxWindow_GetScrollThumb", _wrap_wxWindow_GetScrollThumb, 1 },
-	 { "wxWindow_GetReturnCode", _wrap_wxWindow_GetReturnCode, 1 },
 	 { "wxWindow_GetRect", _wrap_wxWindow_GetRect, 1 },
 	 { "wxWindow_GetPosition", _wrap_wxWindow_GetPosition, 1 },
 	 { "wxWindow_GetPositionTuple", _wrap_wxWindow_GetPositionTuple, 1 },
 	 { "wxWindow_GetParent", _wrap_wxWindow_GetParent, 1 },
 	 { "wxWindow_GetName", _wrap_wxWindow_GetName, 1 },
+	 { "wxWindow_SetLabel", _wrap_wxWindow_SetLabel, 1 },
 	 { "wxWindow_GetLabel", _wrap_wxWindow_GetLabel, 1 },
 	 { "wxWindow_GetId", _wrap_wxWindow_GetId, 1 },
 	 { "wxWindow_GetGrandParent", _wrap_wxWindow_GetGrandParent, 1 },
 	 { "wxWindow_GetForegroundColour", _wrap_wxWindow_GetForegroundColour, 1 },
 	 { "wxWindow_GetFont", _wrap_wxWindow_GetFont, 1 },
-	 { "wxWindow_GetDefaultItem", _wrap_wxWindow_GetDefaultItem, 1 },
 	 { "wxWindow_GetConstraints", _wrap_wxWindow_GetConstraints, 1 },
 	 { "wxWindow_GetClientSize", _wrap_wxWindow_GetClientSize, 1 },
 	 { "wxWindow_GetClientSizeTuple", _wrap_wxWindow_GetClientSizeTuple, 1 },
@@ -6068,6 +6281,8 @@ static PyMethodDef windowscMethods[] = {
 	 { "wxWindow_Close", _wrap_wxWindow_Close, 1 },
 	 { "wxWindow_ClientToScreen", _wrap_wxWindow_ClientToScreen, 1 },
 	 { "wxWindow_ClientToScreenXY", _wrap_wxWindow_ClientToScreenXY, 1 },
+	 { "wxWindow_CenterOnParent", _wrap_wxWindow_CenterOnParent, 1 },
+	 { "wxWindow_CentreOnParent", _wrap_wxWindow_CentreOnParent, 1 },
 	 { "wxWindow_Centre", _wrap_wxWindow_Centre, 1 },
 	 { "wxWindow_Center", _wrap_wxWindow_Center, 1 },
 	 { "wxWindow_CaptureMouse", _wrap_wxWindow_CaptureMouse, 1 },
@@ -6093,12 +6308,17 @@ SWIGEXPORT(void,initwindowsc)() {
  */
 	 SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
 	 SWIG_RegisterMapping("_signed_long","_long",0);
+	 SWIG_RegisterMapping("_wxPrintQuality","_int",0);
+	 SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
+	 SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
+	 SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
+	 SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
+	 SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
+	 SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
 	 SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
 	 SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPyMenu",SwigwxPyMenuTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxPyMenu",SwigwxPyMenuTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler);
@@ -6112,9 +6332,7 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
 	 SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
 	 SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-	 SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);
 	 SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-	 SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
 	 SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
 	 SWIG_RegisterMapping("_byte","_unsigned_char",0);
 	 SWIG_RegisterMapping("_long","_wxDash",0);
@@ -6123,6 +6341,7 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
 	 SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
 	 SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
+	 SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
 	 SWIG_RegisterMapping("_size_t","_unsigned_int",0);
 	 SWIG_RegisterMapping("_size_t","_int",0);
 	 SWIG_RegisterMapping("_size_t","_wxWindowID",0);
@@ -6130,14 +6349,16 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
 	 SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
 	 SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
+	 SWIG_RegisterMapping("_wxPanel","_class_wxScrolledWindow",SwigwxScrolledWindowTowxPanel);
+	 SWIG_RegisterMapping("_wxPanel","_wxScrolledWindow",SwigwxScrolledWindowTowxPanel);
 	 SWIG_RegisterMapping("_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel);
 	 SWIG_RegisterMapping("_wxPanel","_wxDialog",SwigwxDialogTowxPanel);
 	 SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-	 SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);
 	 SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
 	 SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
 	 SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
 	 SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
+	 SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
 	 SWIG_RegisterMapping("_uint","_size_t",0);
 	 SWIG_RegisterMapping("_uint","_unsigned_int",0);
 	 SWIG_RegisterMapping("_uint","_int",0);
@@ -6148,6 +6369,7 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
 	 SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
 	 SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
+	 SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
 	 SWIG_RegisterMapping("_EBool","_signed_int",0);
 	 SWIG_RegisterMapping("_EBool","_int",0);
 	 SWIG_RegisterMapping("_EBool","_wxWindowID",0);
@@ -6159,16 +6381,17 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
 	 SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
 	 SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
+	 SWIG_RegisterMapping("_class_wxPanel","_class_wxScrolledWindow",SwigwxScrolledWindowTowxPanel);
+	 SWIG_RegisterMapping("_class_wxPanel","_wxScrolledWindow",SwigwxScrolledWindowTowxPanel);
 	 SWIG_RegisterMapping("_class_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel);
 	 SWIG_RegisterMapping("_class_wxPanel","_wxDialog",SwigwxDialogTowxPanel);
 	 SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
+	 SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
 	 SWIG_RegisterMapping("_signed_int","_EBool",0);
 	 SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
 	 SWIG_RegisterMapping("_signed_int","_int",0);
 	 SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
 	 SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-	 SWIG_RegisterMapping("_wxMenu","_class_wxPyMenu",SwigwxPyMenuTowxMenu);
-	 SWIG_RegisterMapping("_wxMenu","_wxPyMenu",SwigwxPyMenuTowxMenu);
 	 SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
 	 SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
 	 SWIG_RegisterMapping("_WXTYPE","_short",0);
@@ -6198,27 +6421,27 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
 	 SWIG_RegisterMapping("_unsigned_char","_byte",0);
 	 SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-	 SWIG_RegisterMapping("_class_wxMenu","_class_wxPyMenu",SwigwxPyMenuTowxMenu);
-	 SWIG_RegisterMapping("_class_wxMenu","_wxPyMenu",SwigwxPyMenuTowxMenu);
 	 SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
+	 SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
 	 SWIG_RegisterMapping("_unsigned_int","_size_t",0);
 	 SWIG_RegisterMapping("_unsigned_int","_uint",0);
 	 SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
 	 SWIG_RegisterMapping("_unsigned_int","_int",0);
 	 SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
 	 SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-	 SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
 	 SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
 	 SWIG_RegisterMapping("_short","_WXTYPE",0);
 	 SWIG_RegisterMapping("_short","_unsigned_short",0);
 	 SWIG_RegisterMapping("_short","_signed_short",0);
 	 SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
+	 SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
 	 SWIG_RegisterMapping("_wxWindowID","_size_t",0);
 	 SWIG_RegisterMapping("_wxWindowID","_EBool",0);
 	 SWIG_RegisterMapping("_wxWindowID","_uint",0);
 	 SWIG_RegisterMapping("_wxWindowID","_int",0);
 	 SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
 	 SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
+	 SWIG_RegisterMapping("_int","_wxPrintQuality",0);
 	 SWIG_RegisterMapping("_int","_size_t",0);
 	 SWIG_RegisterMapping("_int","_EBool",0);
 	 SWIG_RegisterMapping("_int","_uint",0);
@@ -6242,8 +6465,6 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxPyMenu",SwigwxPyMenuTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_wxPyMenu",SwigwxPyMenuTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler);