Add *wxTopLevelWindowGTK*RequestUserAttention*int*;

[wxWidgets.git] / wxPython / src / mac / _core_wrap.cpp

diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp
index 23629f0e4cc717c1068345541f27ab252f1b59cd..e65df97ab5b86dc1aa0511b96e5d021dcb9b90e9 100644 (file)
--- a/wxPython/src/mac/_core_wrap.cpp
+++ b/wxPython/src/mac/_core_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);
        return;
       }
     }   
@@ -1472,11 +1473,11 @@ static swig_type_info *swig_types[129];
 
 
 /*-----------------------------------------------
-              @(target):= __core.so
+              @(target):= _core_.so
   ------------------------------------------------*/
-#define SWIG_init    init__core
+#define SWIG_init    init_core_
 
-#define SWIG_name    "__core"
+#define SWIG_name    "_core_"
 
 #include "wx/wxPython/wxPython_int.h"
 #include "wx/wxPython/pyclasses.h"
@@ -2187,7 +2188,7 @@ SWIG_Check_bool(PyObject* obj)
   return SWIG_AsVal_bool(obj, (bool*)0);
 }
 
-static wxString wxFileSystem_URLToFileName(wxString const &url){
+static wxString FileSystem_URLToFileName(wxString const &url){
             wxFileName fname = wxFileSystem::URLToFileName(url);
             return fname.GetFullPath();
         }
@@ -2327,7 +2328,7 @@ static unsigned long wxImageHistogram_GetCount(wxImageHistogram *self,unsigned l
             wxImageHistogramEntry e = (*self)[key];
             return e.value;
         }
-static unsigned long wxImageHistogram_GetCountRGB(wxImageHistogram *self,unsigned char r,unsigned char g,unsigned char b){
+static unsigned long wxImageHistogram_GetCountRGB(wxImageHistogram *self,byte r,byte g,byte b){
             unsigned long key = wxImageHistogram::MakeKey(r, g, b);
             wxImageHistogramEntry e = (*self)[key];
             return e.value;
@@ -2475,7 +2476,7 @@ static wxBitmap wxImage_ConvertToBitmap(wxImage *self,int depth=-1){
             wxBitmap bitmap(*self, depth);
             return bitmap;
         }
-static wxBitmap wxImage_ConvertToMonoBitmap(wxImage *self,unsigned char red,unsigned char green,unsigned char blue){
+static wxBitmap wxImage_ConvertToMonoBitmap(wxImage *self,byte red,byte green,byte blue){
             wxImage mono = self->ConvertToMono( red, green, blue );
             wxBitmap bitmap( mono, 1 );
             return bitmap;
@@ -2498,7 +2499,7 @@ static wxBitmap wxImage_ConvertToMonoBitmap(wxImage *self,unsigned char red,unsi
 
 #include <wx/quantize.h>
 
-static bool wxQuantize_Quantize(wxImage const &src,wxImage &dest,int desiredNoColours=236,int flags=wxQUANTIZE_INCLUDE_WINDOWS_COLOURS|wxQUANTIZE_FILL_DESTINATION_IMAGE){
+static bool Quantize_Quantize(wxImage const &src,wxImage &dest,int desiredNoColours=236,int flags=wxQUANTIZE_INCLUDE_WINDOWS_COLOURS|wxQUANTIZE_FILL_DESTINATION_IMAGE){
                 return wxQuantize::Quantize(src, dest, 
                                             //NULL, // palette
                                             desiredNoColours,
@@ -2611,16 +2612,19 @@ static void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){
 static PyObject *wxDropFilesEvent_GetFiles(wxDropFilesEvent *self){
             int         count = self->GetNumberOfFiles();
             wxString*   files = self->GetFiles();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
             PyObject*   list  = PyList_New(count);
 
             if (!list) {
                 PyErr_SetString(PyExc_MemoryError, "Can't allocate list of files!");
+                wxPyEndBlockThreads(blocked);
                 return NULL;
             }
 
             for (int i=0; i<count; i++) {
                 PyList_SetItem(list, i, wx2PyString(files[i]));
             }
+            wxPyEndBlockThreads(blocked);
             return list;
         }
 
@@ -2629,7 +2633,7 @@ static wxPyApp *new_wxPyApp(){
             wxPythonApp = new wxPyApp();
             return wxPythonApp;
         }
-static int wxPyApp_GetComCtl32Version(){ wxPyRaiseNotImplemented(); return 0; }
+static int PyApp_GetComCtl32Version(){ wxPyRaiseNotImplemented(); return 0; }
 
     void wxApp_CleanUp() {
         __wxPyCleanup();
@@ -2725,6 +2729,7 @@ static long wxWindow_GetHandle(wxWindow *self){
 static void wxWindow_AssociateHandle(wxWindow *self,long handle){
             self->AssociateHandle((WXWidget)handle);
         }
+static void wxWindow_DragAcceptFiles(wxWindow *self,bool accept){}
 
 wxWindow* wxFindWindowById( long id, const wxWindow *parent = NULL ) {
     return wxWindow::FindWindowById(id, parent);
@@ -2766,6 +2771,11 @@ wxWindow* wxFindWindowByLabel( const wxString& label,
     }
 
 
+    PyObject* GetTopLevelWindows() {
+        return wxPy_ConvertList(&wxTopLevelWindows);
+    }
+
+
 IMP_PYCALLBACK_BOOL_WXWIN(wxPyValidator, wxValidator, Validate);
 IMP_PYCALLBACK_BOOL_(wxPyValidator, wxValidator, TransferToWindow);
 IMP_PYCALLBACK_BOOL_(wxPyValidator, wxValidator, TransferFromWindow);
@@ -2788,7 +2798,7 @@ static void wxMenuItem_SetDisabledBitmap(wxMenuItem *self,wxBitmap const &bmpDis
 static wxBitmap const &wxMenuItem_GetDisabledBitmap(wxMenuItem const *self){ return wxNullBitmap; }
 static void wxMenuItem_SetMarginWidth(wxMenuItem *self,int nWidth){}
 static int wxMenuItem_GetMarginWidth(wxMenuItem *self){ return 0; }
-static int wxMenuItem_GetDefaultMarginWidth(){ return 0; }
+static int MenuItem_GetDefaultMarginWidth(){ return 0; }
 static bool wxMenuItem_IsOwnerDrawn(wxMenuItem *self){ return false; }
 static void wxMenuItem_SetOwnerDrawn(wxMenuItem *self,bool ownerDrawn=true){}
 static void wxMenuItem_ResetOwnerDrawn(wxMenuItem *self){}
@@ -3268,7 +3278,7 @@ static PyObject *_wrap_EmptyString_get(void) {
 }
 
 
-static PyObject *_wrap_wxObject_GetClassName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Object_GetClassName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxObject *arg1 = (wxObject *) 0 ;
     wxString result;
@@ -3277,7 +3287,7 @@ static PyObject *_wrap_wxObject_GetClassName(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxObject_GetClassName",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Object_GetClassName",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxObject, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3300,7 +3310,7 @@ static PyObject *_wrap_wxObject_GetClassName(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxObject_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Object_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxObject *arg1 = (wxObject *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3308,7 +3318,7 @@ static PyObject *_wrap_wxObject_Destroy(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxObject_Destroy",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Object_Destroy",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxObject, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3325,14 +3335,14 @@ static PyObject *_wrap_wxObject_Destroy(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxObject_swigregister(PyObject *, PyObject *args) {
+static PyObject * Object_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxObject, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxSize_width_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_width_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int arg2 ;
@@ -3342,7 +3352,7 @@ static PyObject *_wrap_wxSize_width_set(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "x", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSize_width_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_width_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3358,7 +3368,7 @@ static PyObject *_wrap_wxSize_width_set(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxSize_width_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_width_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int result;
@@ -3367,7 +3377,7 @@ static PyObject *_wrap_wxSize_width_get(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSize_width_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_width_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->x);
@@ -3381,7 +3391,7 @@ static PyObject *_wrap_wxSize_width_get(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxSize_height_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_height_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int arg2 ;
@@ -3391,7 +3401,7 @@ static PyObject *_wrap_wxSize_height_set(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSize_height_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_height_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3407,7 +3417,7 @@ static PyObject *_wrap_wxSize_height_set(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxSize_height_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_height_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int result;
@@ -3416,7 +3426,7 @@ static PyObject *_wrap_wxSize_height_get(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSize_height_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_height_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->y);
@@ -3430,7 +3440,7 @@ static PyObject *_wrap_wxSize_height_get(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_wxSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Size(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -3441,7 +3451,7 @@ static PyObject *_wrap_new_wxSize(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "w",(char *) "h", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxSize",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Size",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -3468,7 +3478,7 @@ static PyObject *_wrap_new_wxSize(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_delete_wxSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Size(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3476,7 +3486,7 @@ static PyObject *_wrap_delete_wxSize(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Size",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3493,7 +3503,7 @@ static PyObject *_wrap_delete_wxSize(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxSize___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -3505,7 +3515,7 @@ static PyObject *_wrap_wxSize___eq__(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "sz", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSize___eq__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___eq__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3528,7 +3538,7 @@ static PyObject *_wrap_wxSize___eq__(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxSize___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -3540,7 +3550,7 @@ static PyObject *_wrap_wxSize___ne__(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "sz", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSize___ne__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___ne__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3563,7 +3573,7 @@ static PyObject *_wrap_wxSize___ne__(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxSize___add__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size___add__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -3575,7 +3585,7 @@ static PyObject *_wrap_wxSize___add__(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "sz", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSize___add__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___add__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3600,7 +3610,7 @@ static PyObject *_wrap_wxSize___add__(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxSize___sub__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size___sub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -3612,7 +3622,7 @@ static PyObject *_wrap_wxSize___sub__(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "sz", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSize___sub__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___sub__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3637,7 +3647,7 @@ static PyObject *_wrap_wxSize___sub__(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxSize_IncTo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_IncTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -3648,7 +3658,7 @@ static PyObject *_wrap_wxSize_IncTo(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self",(char *) "sz", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSize_IncTo",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_IncTo",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3669,7 +3679,7 @@ static PyObject *_wrap_wxSize_IncTo(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxSize_DecTo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_DecTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -3680,7 +3690,7 @@ static PyObject *_wrap_wxSize_DecTo(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self",(char *) "sz", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSize_DecTo",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_DecTo",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3701,7 +3711,7 @@ static PyObject *_wrap_wxSize_DecTo(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxSize_Set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int arg2 ;
@@ -3713,7 +3723,7 @@ static PyObject *_wrap_wxSize_Set(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "self",(char *) "w",(char *) "h", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxSize_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Size_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3738,7 +3748,7 @@ static PyObject *_wrap_wxSize_Set(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_wxSize_SetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_SetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int arg2 ;
@@ -3748,7 +3758,7 @@ static PyObject *_wrap_wxSize_SetWidth(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "w", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSize_SetWidth",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_SetWidth",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3769,7 +3779,7 @@ static PyObject *_wrap_wxSize_SetWidth(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxSize_SetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_SetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int arg2 ;
@@ -3779,7 +3789,7 @@ static PyObject *_wrap_wxSize_SetHeight(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "h", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSize_SetHeight",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_SetHeight",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3800,7 +3810,7 @@ static PyObject *_wrap_wxSize_SetHeight(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxSize_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int result;
@@ -3809,7 +3819,7 @@ static PyObject *_wrap_wxSize_GetWidth(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSize_GetWidth",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_GetWidth",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3828,7 +3838,7 @@ static PyObject *_wrap_wxSize_GetWidth(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxSize_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int result;
@@ -3837,7 +3847,7 @@ static PyObject *_wrap_wxSize_GetHeight(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSize_GetHeight",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_GetHeight",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3856,7 +3866,7 @@ static PyObject *_wrap_wxSize_GetHeight(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxSize_IsFullySpecified(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_IsFullySpecified(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     bool result;
@@ -3865,7 +3875,7 @@ static PyObject *_wrap_wxSize_IsFullySpecified(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSize_IsFullySpecified",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_IsFullySpecified",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3884,7 +3894,7 @@ static PyObject *_wrap_wxSize_IsFullySpecified(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxSize_SetDefaults(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_SetDefaults(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -3895,7 +3905,7 @@ static PyObject *_wrap_wxSize_SetDefaults(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "size", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSize_SetDefaults",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_SetDefaults",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3916,7 +3926,7 @@ static PyObject *_wrap_wxSize_SetDefaults(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxSize_Get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     PyObject *result;
@@ -3925,7 +3935,7 @@ static PyObject *_wrap_wxSize_Get(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSize_Get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_Get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3942,14 +3952,14 @@ static PyObject *_wrap_wxSize_Get(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject * wxSize_swigregister(PyObject *, PyObject *args) {
+static PyObject * Size_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSize, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxRealPoint_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     double arg2 ;
@@ -3959,7 +3969,7 @@ static PyObject *_wrap_wxRealPoint_x_set(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "x", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRealPoint_x_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint_x_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRealPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -3975,7 +3985,7 @@ static PyObject *_wrap_wxRealPoint_x_set(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxRealPoint_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     double result;
@@ -3984,7 +3994,7 @@ static PyObject *_wrap_wxRealPoint_x_get(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRealPoint_x_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RealPoint_x_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRealPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (double) ((arg1)->x);
@@ -3998,7 +4008,7 @@ static PyObject *_wrap_wxRealPoint_x_get(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxRealPoint_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     double arg2 ;
@@ -4008,7 +4018,7 @@ static PyObject *_wrap_wxRealPoint_y_set(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRealPoint_y_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint_y_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRealPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4024,7 +4034,7 @@ static PyObject *_wrap_wxRealPoint_y_set(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxRealPoint_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     double result;
@@ -4033,7 +4043,7 @@ static PyObject *_wrap_wxRealPoint_y_get(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRealPoint_y_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RealPoint_y_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRealPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (double) ((arg1)->y);
@@ -4047,7 +4057,7 @@ static PyObject *_wrap_wxRealPoint_y_get(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_wxRealPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_RealPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -4058,7 +4068,7 @@ static PyObject *_wrap_new_wxRealPoint(PyObject *, PyObject *args, PyObject *kwa
         (char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxRealPoint",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_RealPoint",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (double)(SWIG_As_double(obj0)); 
@@ -4085,7 +4095,7 @@ static PyObject *_wrap_new_wxRealPoint(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_delete_wxRealPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_RealPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4093,7 +4103,7 @@ static PyObject *_wrap_delete_wxRealPoint(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxRealPoint",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_RealPoint",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRealPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4110,7 +4120,7 @@ static PyObject *_wrap_delete_wxRealPoint(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxRealPoint___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     wxRealPoint *arg2 = 0 ;
@@ -4122,7 +4132,7 @@ static PyObject *_wrap_wxRealPoint___eq__(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRealPoint___eq__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___eq__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRealPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4145,7 +4155,7 @@ static PyObject *_wrap_wxRealPoint___eq__(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxRealPoint___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     wxRealPoint *arg2 = 0 ;
@@ -4157,7 +4167,7 @@ static PyObject *_wrap_wxRealPoint___ne__(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRealPoint___ne__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___ne__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRealPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4180,7 +4190,7 @@ static PyObject *_wrap_wxRealPoint___ne__(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxRealPoint___add__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint___add__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     wxRealPoint *arg2 = 0 ;
@@ -4192,7 +4202,7 @@ static PyObject *_wrap_wxRealPoint___add__(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRealPoint___add__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___add__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRealPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4217,7 +4227,7 @@ static PyObject *_wrap_wxRealPoint___add__(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxRealPoint___sub__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint___sub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     wxRealPoint *arg2 = 0 ;
@@ -4229,7 +4239,7 @@ static PyObject *_wrap_wxRealPoint___sub__(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRealPoint___sub__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___sub__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRealPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4254,7 +4264,7 @@ static PyObject *_wrap_wxRealPoint___sub__(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxRealPoint_Set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     double arg2 ;
@@ -4266,7 +4276,7 @@ static PyObject *_wrap_wxRealPoint_Set(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxRealPoint_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RealPoint_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRealPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4291,7 +4301,7 @@ static PyObject *_wrap_wxRealPoint_Set(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxRealPoint_Get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     PyObject *result;
@@ -4300,7 +4310,7 @@ static PyObject *_wrap_wxRealPoint_Get(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRealPoint_Get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RealPoint_Get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRealPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4317,14 +4327,14 @@ static PyObject *_wrap_wxRealPoint_Get(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject * wxRealPoint_swigregister(PyObject *, PyObject *args) {
+static PyObject * RealPoint_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxRealPoint, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxPoint_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     int arg2 ;
@@ -4334,7 +4344,7 @@ static PyObject *_wrap_wxPoint_x_set(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "x", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint_x_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point_x_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4350,7 +4360,7 @@ static PyObject *_wrap_wxPoint_x_set(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxPoint_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     int result;
@@ -4359,7 +4369,7 @@ static PyObject *_wrap_wxPoint_x_get(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPoint_x_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point_x_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->x);
@@ -4373,7 +4383,7 @@ static PyObject *_wrap_wxPoint_x_get(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxPoint_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     int arg2 ;
@@ -4383,7 +4393,7 @@ static PyObject *_wrap_wxPoint_y_set(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint_y_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point_y_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4399,7 +4409,7 @@ static PyObject *_wrap_wxPoint_y_set(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxPoint_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     int result;
@@ -4408,7 +4418,7 @@ static PyObject *_wrap_wxPoint_y_get(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPoint_y_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point_y_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->y);
@@ -4422,7 +4432,7 @@ static PyObject *_wrap_wxPoint_y_get(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_new_wxPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Point(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -4433,7 +4443,7 @@ static PyObject *_wrap_new_wxPoint(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxPoint",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Point",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -4460,7 +4470,7 @@ static PyObject *_wrap_new_wxPoint(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_delete_wxPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Point(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4468,7 +4478,7 @@ static PyObject *_wrap_delete_wxPoint(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxPoint",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Point",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4485,7 +4495,7 @@ static PyObject *_wrap_delete_wxPoint(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxPoint___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -4497,7 +4507,7 @@ static PyObject *_wrap_wxPoint___eq__(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint___eq__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___eq__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4520,7 +4530,7 @@ static PyObject *_wrap_wxPoint___eq__(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxPoint___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -4532,7 +4542,7 @@ static PyObject *_wrap_wxPoint___ne__(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint___ne__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___ne__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4555,7 +4565,7 @@ static PyObject *_wrap_wxPoint___ne__(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxPoint___add__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point___add__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -4567,7 +4577,7 @@ static PyObject *_wrap_wxPoint___add__(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint___add__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___add__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4592,7 +4602,7 @@ static PyObject *_wrap_wxPoint___add__(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxPoint___sub__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point___sub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -4604,7 +4614,7 @@ static PyObject *_wrap_wxPoint___sub__(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint___sub__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___sub__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4629,7 +4639,7 @@ static PyObject *_wrap_wxPoint___sub__(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxPoint___iadd__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point___iadd__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -4641,7 +4651,7 @@ static PyObject *_wrap_wxPoint___iadd__(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint___iadd__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___iadd__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4665,7 +4675,7 @@ static PyObject *_wrap_wxPoint___iadd__(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxPoint___isub__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point___isub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -4677,7 +4687,7 @@ static PyObject *_wrap_wxPoint___isub__(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint___isub__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___isub__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4701,7 +4711,7 @@ static PyObject *_wrap_wxPoint___isub__(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxPoint_Set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     long arg2 ;
@@ -4713,7 +4723,7 @@ static PyObject *_wrap_wxPoint_Set(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxPoint_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Point_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4738,7 +4748,7 @@ static PyObject *_wrap_wxPoint_Set(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_wxPoint_Get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     PyObject *result;
@@ -4747,7 +4757,7 @@ static PyObject *_wrap_wxPoint_Get(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPoint_Get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point_Get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4764,14 +4774,14 @@ static PyObject *_wrap_wxPoint_Get(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject * wxPoint_swigregister(PyObject *, PyObject *args) {
+static PyObject * Point_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPoint, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Rect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -4786,7 +4796,7 @@ static PyObject *_wrap_new_wxRect(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_wxRect",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_Rect",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -4926,7 +4936,7 @@ static PyObject *_wrap_new_RectS(PyObject *, PyObject *args, PyObject *kwargs) {
 }
 
 
-static PyObject *_wrap_delete_wxRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Rect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4934,7 +4944,7 @@ static PyObject *_wrap_delete_wxRect(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxRect",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Rect",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4951,7 +4961,7 @@ static PyObject *_wrap_delete_wxRect(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxRect_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -4960,7 +4970,7 @@ static PyObject *_wrap_wxRect_GetX(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_GetX",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetX",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -4979,7 +4989,7 @@ static PyObject *_wrap_wxRect_GetX(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_wxRect_SetX(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -4989,7 +4999,7 @@ static PyObject *_wrap_wxRect_SetX(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "self",(char *) "x", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_SetX",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetX",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5010,7 +5020,7 @@ static PyObject *_wrap_wxRect_SetX(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_wxRect_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -5019,7 +5029,7 @@ static PyObject *_wrap_wxRect_GetY(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_GetY",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetY",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5038,7 +5048,7 @@ static PyObject *_wrap_wxRect_GetY(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_wxRect_SetY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -5048,7 +5058,7 @@ static PyObject *_wrap_wxRect_SetY(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "self",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_SetY",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetY",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5069,7 +5079,7 @@ static PyObject *_wrap_wxRect_SetY(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_wxRect_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -5078,7 +5088,7 @@ static PyObject *_wrap_wxRect_GetWidth(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_GetWidth",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetWidth",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5097,7 +5107,7 @@ static PyObject *_wrap_wxRect_GetWidth(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxRect_SetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -5107,7 +5117,7 @@ static PyObject *_wrap_wxRect_SetWidth(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "w", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_SetWidth",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetWidth",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5128,7 +5138,7 @@ static PyObject *_wrap_wxRect_SetWidth(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxRect_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -5137,7 +5147,7 @@ static PyObject *_wrap_wxRect_GetHeight(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_GetHeight",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetHeight",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5156,7 +5166,7 @@ static PyObject *_wrap_wxRect_GetHeight(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxRect_SetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -5166,7 +5176,7 @@ static PyObject *_wrap_wxRect_SetHeight(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "h", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_SetHeight",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetHeight",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5187,7 +5197,7 @@ static PyObject *_wrap_wxRect_SetHeight(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxRect_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint result;
@@ -5196,7 +5206,7 @@ static PyObject *_wrap_wxRect_GetPosition(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_GetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5217,7 +5227,7 @@ static PyObject *_wrap_wxRect_GetPosition(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxRect_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -5228,7 +5238,7 @@ static PyObject *_wrap_wxRect_SetPosition(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "p", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_SetPosition",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetPosition",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5249,7 +5259,7 @@ static PyObject *_wrap_wxRect_SetPosition(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxRect_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxSize result;
@@ -5258,7 +5268,7 @@ static PyObject *_wrap_wxRect_GetSize(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_GetSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5279,7 +5289,7 @@ static PyObject *_wrap_wxRect_GetSize(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxRect_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxSize *arg2 = 0 ;
@@ -5290,7 +5300,7 @@ static PyObject *_wrap_wxRect_SetSize(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "s", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_SetSize",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetSize",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5311,7 +5321,7 @@ static PyObject *_wrap_wxRect_SetSize(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxRect_IsEmpty(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_IsEmpty(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     bool result;
@@ -5320,7 +5330,7 @@ static PyObject *_wrap_wxRect_IsEmpty(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_IsEmpty",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_IsEmpty",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5339,7 +5349,7 @@ static PyObject *_wrap_wxRect_IsEmpty(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxRect_GetTopLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetTopLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint result;
@@ -5348,7 +5358,7 @@ static PyObject *_wrap_wxRect_GetTopLeft(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_GetTopLeft",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetTopLeft",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5369,7 +5379,7 @@ static PyObject *_wrap_wxRect_GetTopLeft(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxRect_SetTopLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetTopLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -5380,7 +5390,7 @@ static PyObject *_wrap_wxRect_SetTopLeft(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "p", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_SetTopLeft",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetTopLeft",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5401,7 +5411,7 @@ static PyObject *_wrap_wxRect_SetTopLeft(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxRect_GetBottomRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetBottomRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint result;
@@ -5410,7 +5420,7 @@ static PyObject *_wrap_wxRect_GetBottomRight(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_GetBottomRight",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetBottomRight",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5431,7 +5441,7 @@ static PyObject *_wrap_wxRect_GetBottomRight(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxRect_SetBottomRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetBottomRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -5442,7 +5452,7 @@ static PyObject *_wrap_wxRect_SetBottomRight(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "p", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_SetBottomRight",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetBottomRight",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5463,7 +5473,7 @@ static PyObject *_wrap_wxRect_SetBottomRight(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxRect_GetLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -5472,7 +5482,7 @@ static PyObject *_wrap_wxRect_GetLeft(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_GetLeft",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetLeft",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5491,7 +5501,7 @@ static PyObject *_wrap_wxRect_GetLeft(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxRect_GetTop(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -5500,7 +5510,7 @@ static PyObject *_wrap_wxRect_GetTop(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_GetTop",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetTop",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5519,7 +5529,7 @@ static PyObject *_wrap_wxRect_GetTop(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxRect_GetBottom(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetBottom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -5528,7 +5538,7 @@ static PyObject *_wrap_wxRect_GetBottom(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_GetBottom",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetBottom",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5547,7 +5557,7 @@ static PyObject *_wrap_wxRect_GetBottom(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxRect_GetRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -5556,7 +5566,7 @@ static PyObject *_wrap_wxRect_GetRight(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_GetRight",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetRight",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5575,7 +5585,7 @@ static PyObject *_wrap_wxRect_GetRight(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxRect_SetLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -5585,7 +5595,7 @@ static PyObject *_wrap_wxRect_SetLeft(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "left", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_SetLeft",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetLeft",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5606,7 +5616,7 @@ static PyObject *_wrap_wxRect_SetLeft(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxRect_SetRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -5616,7 +5626,7 @@ static PyObject *_wrap_wxRect_SetRight(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "right", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_SetRight",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetRight",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5637,7 +5647,7 @@ static PyObject *_wrap_wxRect_SetRight(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxRect_SetTop(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -5647,7 +5657,7 @@ static PyObject *_wrap_wxRect_SetTop(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "top", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_SetTop",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetTop",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5668,7 +5678,7 @@ static PyObject *_wrap_wxRect_SetTop(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxRect_SetBottom(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetBottom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -5678,7 +5688,7 @@ static PyObject *_wrap_wxRect_SetBottom(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "bottom", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_SetBottom",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetBottom",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5699,7 +5709,7 @@ static PyObject *_wrap_wxRect_SetBottom(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxRect_Inflate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Inflate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -5712,7 +5722,7 @@ static PyObject *_wrap_wxRect_Inflate(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "dx",(char *) "dy", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxRect_Inflate",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_Inflate",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5740,7 +5750,7 @@ static PyObject *_wrap_wxRect_Inflate(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxRect_Deflate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Deflate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -5753,7 +5763,7 @@ static PyObject *_wrap_wxRect_Deflate(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "dx",(char *) "dy", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxRect_Deflate",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_Deflate",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5781,7 +5791,7 @@ static PyObject *_wrap_wxRect_Deflate(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxRect_OffsetXY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_OffsetXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -5793,7 +5803,7 @@ static PyObject *_wrap_wxRect_OffsetXY(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "dx",(char *) "dy", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxRect_OffsetXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_OffsetXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5818,7 +5828,7 @@ static PyObject *_wrap_wxRect_OffsetXY(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxRect_Offset(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Offset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -5829,7 +5839,7 @@ static PyObject *_wrap_wxRect_Offset(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_Offset",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Offset",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5850,7 +5860,7 @@ static PyObject *_wrap_wxRect_Offset(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxRect_Intersect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Intersect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = 0 ;
@@ -5862,7 +5872,7 @@ static PyObject *_wrap_wxRect_Intersect(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_Intersect",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Intersect",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5887,7 +5897,7 @@ static PyObject *_wrap_wxRect_Intersect(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxRect_Union(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Union(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = 0 ;
@@ -5899,7 +5909,7 @@ static PyObject *_wrap_wxRect_Union(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_Union",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Union",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5924,7 +5934,7 @@ static PyObject *_wrap_wxRect_Union(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxRect___add__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect___add__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = 0 ;
@@ -5936,7 +5946,7 @@ static PyObject *_wrap_wxRect___add__(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect___add__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___add__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5961,7 +5971,7 @@ static PyObject *_wrap_wxRect___add__(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxRect___iadd__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect___iadd__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = 0 ;
@@ -5973,7 +5983,7 @@ static PyObject *_wrap_wxRect___iadd__(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect___iadd__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___iadd__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -5997,7 +6007,7 @@ static PyObject *_wrap_wxRect___iadd__(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxRect___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = 0 ;
@@ -6009,7 +6019,7 @@ static PyObject *_wrap_wxRect___eq__(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect___eq__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___eq__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6032,7 +6042,7 @@ static PyObject *_wrap_wxRect___eq__(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxRect___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = 0 ;
@@ -6044,7 +6054,7 @@ static PyObject *_wrap_wxRect___ne__(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect___ne__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___ne__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6067,7 +6077,7 @@ static PyObject *_wrap_wxRect___ne__(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxRect_InsideXY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_InsideXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -6080,7 +6090,7 @@ static PyObject *_wrap_wxRect_InsideXY(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxRect_InsideXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_InsideXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6107,7 +6117,7 @@ static PyObject *_wrap_wxRect_InsideXY(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxRect_Inside(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Inside(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -6119,7 +6129,7 @@ static PyObject *_wrap_wxRect_Inside(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_Inside",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Inside",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6142,7 +6152,7 @@ static PyObject *_wrap_wxRect_Inside(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxRect_Intersects(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Intersects(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = 0 ;
@@ -6154,7 +6164,7 @@ static PyObject *_wrap_wxRect_Intersects(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_Intersects",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Intersects",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6177,7 +6187,7 @@ static PyObject *_wrap_wxRect_Intersects(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxRect_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -6187,7 +6197,7 @@ static PyObject *_wrap_wxRect_x_set(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self",(char *) "x", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_x_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_x_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6203,7 +6213,7 @@ static PyObject *_wrap_wxRect_x_set(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxRect_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -6212,7 +6222,7 @@ static PyObject *_wrap_wxRect_x_get(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_x_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_x_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->x);
@@ -6226,7 +6236,7 @@ static PyObject *_wrap_wxRect_x_get(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxRect_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -6236,7 +6246,7 @@ static PyObject *_wrap_wxRect_y_set(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_y_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_y_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6252,7 +6262,7 @@ static PyObject *_wrap_wxRect_y_set(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxRect_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -6261,7 +6271,7 @@ static PyObject *_wrap_wxRect_y_get(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_y_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_y_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->y);
@@ -6275,7 +6285,7 @@ static PyObject *_wrap_wxRect_y_get(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxRect_width_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_width_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -6285,7 +6295,7 @@ static PyObject *_wrap_wxRect_width_set(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "width", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_width_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_width_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6301,7 +6311,7 @@ static PyObject *_wrap_wxRect_width_set(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxRect_width_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_width_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -6310,7 +6320,7 @@ static PyObject *_wrap_wxRect_width_get(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_width_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_width_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->width);
@@ -6324,7 +6334,7 @@ static PyObject *_wrap_wxRect_width_get(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxRect_height_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_height_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -6334,7 +6344,7 @@ static PyObject *_wrap_wxRect_height_set(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxRect_height_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_height_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6350,7 +6360,7 @@ static PyObject *_wrap_wxRect_height_set(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxRect_height_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_height_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -6359,7 +6369,7 @@ static PyObject *_wrap_wxRect_height_get(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_height_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_height_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->height);
@@ -6373,7 +6383,7 @@ static PyObject *_wrap_wxRect_height_get(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxRect_Set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 = (int) 0 ;
@@ -6389,7 +6399,7 @@ static PyObject *_wrap_wxRect_Set(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:wxRect_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:Rect_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -6430,7 +6440,7 @@ static PyObject *_wrap_wxRect_Set(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_wxRect_Get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     PyObject *result;
@@ -6439,7 +6449,7 @@ static PyObject *_wrap_wxRect_Get(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxRect_Get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_Get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6456,14 +6466,14 @@ static PyObject *_wrap_wxRect_Get(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject * wxRect_swigregister(PyObject *, PyObject *args) {
+static PyObject * Rect_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxRect, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxIntersectRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IntersectRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = (wxRect *) 0 ;
@@ -6474,7 +6484,7 @@ static PyObject *_wrap_wxIntersectRect(PyObject *, PyObject *args, PyObject *kwa
         (char *) "r1",(char *) "r2", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxIntersectRect",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IntersectRect",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
@@ -6494,7 +6504,7 @@ static PyObject *_wrap_wxIntersectRect(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_new_wxPoint2D(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Point2D(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -6505,7 +6515,7 @@ static PyObject *_wrap_new_wxPoint2D(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxPoint2D",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Point2D",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (double)(SWIG_As_double(obj0)); 
@@ -6590,7 +6600,7 @@ static PyObject *_wrap_new_Point2DFromPoint(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxPoint2D_GetFloor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetFloor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -6606,7 +6616,7 @@ static PyObject *_wrap_wxPoint2D_GetFloor(PyObject *, PyObject *args, PyObject *
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPoint2D_GetFloor",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_GetFloor",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6627,7 +6637,7 @@ static PyObject *_wrap_wxPoint2D_GetFloor(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxPoint2D_GetRounded(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetRounded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -6643,7 +6653,7 @@ static PyObject *_wrap_wxPoint2D_GetRounded(PyObject *, PyObject *args, PyObject
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPoint2D_GetRounded",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_GetRounded",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6664,7 +6674,7 @@ static PyObject *_wrap_wxPoint2D_GetRounded(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxPoint2D_GetVectorLength(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetVectorLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double result;
@@ -6673,7 +6683,7 @@ static PyObject *_wrap_wxPoint2D_GetVectorLength(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPoint2D_GetVectorLength",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_GetVectorLength",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6692,7 +6702,7 @@ static PyObject *_wrap_wxPoint2D_GetVectorLength(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxPoint2D_GetVectorAngle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetVectorAngle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double result;
@@ -6701,7 +6711,7 @@ static PyObject *_wrap_wxPoint2D_GetVectorAngle(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPoint2D_GetVectorAngle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_GetVectorAngle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6720,7 +6730,7 @@ static PyObject *_wrap_wxPoint2D_GetVectorAngle(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxPoint2D_SetVectorLength(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_SetVectorLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double arg2 ;
@@ -6730,7 +6740,7 @@ static PyObject *_wrap_wxPoint2D_SetVectorLength(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "length", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D_SetVectorLength",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_SetVectorLength",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6751,7 +6761,7 @@ static PyObject *_wrap_wxPoint2D_SetVectorLength(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxPoint2D_SetVectorAngle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_SetVectorAngle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double arg2 ;
@@ -6761,7 +6771,7 @@ static PyObject *_wrap_wxPoint2D_SetVectorAngle(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "degrees", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D_SetVectorAngle",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_SetVectorAngle",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6782,7 +6792,7 @@ static PyObject *_wrap_wxPoint2D_SetVectorAngle(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxPoint2D_GetDistance(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetDistance(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -6794,7 +6804,7 @@ static PyObject *_wrap_wxPoint2D_GetDistance(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D_GetDistance",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_GetDistance",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6817,7 +6827,7 @@ static PyObject *_wrap_wxPoint2D_GetDistance(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxPoint2D_GetDistanceSquare(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetDistanceSquare(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -6829,7 +6839,7 @@ static PyObject *_wrap_wxPoint2D_GetDistanceSquare(PyObject *, PyObject *args, P
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D_GetDistanceSquare",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_GetDistanceSquare",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6852,7 +6862,7 @@ static PyObject *_wrap_wxPoint2D_GetDistanceSquare(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxPoint2D_GetDotProduct(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetDotProduct(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -6864,7 +6874,7 @@ static PyObject *_wrap_wxPoint2D_GetDotProduct(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "vec", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D_GetDotProduct",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_GetDotProduct",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6887,7 +6897,7 @@ static PyObject *_wrap_wxPoint2D_GetDotProduct(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxPoint2D_GetCrossProduct(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetCrossProduct(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -6899,7 +6909,7 @@ static PyObject *_wrap_wxPoint2D_GetCrossProduct(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "vec", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D_GetCrossProduct",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_GetCrossProduct",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6922,7 +6932,7 @@ static PyObject *_wrap_wxPoint2D_GetCrossProduct(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxPoint2D___neg__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___neg__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D result;
@@ -6931,7 +6941,7 @@ static PyObject *_wrap_wxPoint2D___neg__(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPoint2D___neg__",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D___neg__",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6952,7 +6962,7 @@ static PyObject *_wrap_wxPoint2D___neg__(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxPoint2D___iadd__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___iadd__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -6964,7 +6974,7 @@ static PyObject *_wrap_wxPoint2D___iadd__(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D___iadd__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___iadd__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -6988,7 +6998,7 @@ static PyObject *_wrap_wxPoint2D___iadd__(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxPoint2D___isub__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___isub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -7000,7 +7010,7 @@ static PyObject *_wrap_wxPoint2D___isub__(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D___isub__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___isub__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -7024,7 +7034,7 @@ static PyObject *_wrap_wxPoint2D___isub__(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxPoint2D___imul__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___imul__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -7036,7 +7046,7 @@ static PyObject *_wrap_wxPoint2D___imul__(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D___imul__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___imul__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -7060,7 +7070,7 @@ static PyObject *_wrap_wxPoint2D___imul__(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxPoint2D___idiv__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___idiv__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -7072,7 +7082,7 @@ static PyObject *_wrap_wxPoint2D___idiv__(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D___idiv__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___idiv__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -7096,7 +7106,7 @@ static PyObject *_wrap_wxPoint2D___idiv__(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxPoint2D___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -7108,7 +7118,7 @@ static PyObject *_wrap_wxPoint2D___eq__(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D___eq__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___eq__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -7131,7 +7141,7 @@ static PyObject *_wrap_wxPoint2D___eq__(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxPoint2D___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -7143,7 +7153,7 @@ static PyObject *_wrap_wxPoint2D___ne__(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D___ne__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___ne__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -7166,7 +7176,7 @@ static PyObject *_wrap_wxPoint2D___ne__(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxPoint2D_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double arg2 ;
@@ -7176,7 +7186,7 @@ static PyObject *_wrap_wxPoint2D_x_set(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "m_x", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D_x_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_x_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -7192,7 +7202,7 @@ static PyObject *_wrap_wxPoint2D_x_set(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxPoint2D_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double result;
@@ -7201,7 +7211,7 @@ static PyObject *_wrap_wxPoint2D_x_get(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPoint2D_x_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_x_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (double) ((arg1)->m_x);
@@ -7215,7 +7225,7 @@ static PyObject *_wrap_wxPoint2D_x_get(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxPoint2D_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double arg2 ;
@@ -7225,7 +7235,7 @@ static PyObject *_wrap_wxPoint2D_y_set(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "m_y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPoint2D_y_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_y_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -7241,7 +7251,7 @@ static PyObject *_wrap_wxPoint2D_y_set(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxPoint2D_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double result;
@@ -7250,7 +7260,7 @@ static PyObject *_wrap_wxPoint2D_y_get(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPoint2D_y_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_y_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (double) ((arg1)->m_y);
@@ -7264,7 +7274,7 @@ static PyObject *_wrap_wxPoint2D_y_get(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxPoint2D_Set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double arg2 = (double) 0 ;
@@ -7276,7 +7286,7 @@ static PyObject *_wrap_wxPoint2D_Set(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:wxPoint2D_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Point2D_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -7305,7 +7315,7 @@ static PyObject *_wrap_wxPoint2D_Set(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxPoint2D_Get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     PyObject *result;
@@ -7314,7 +7324,7 @@ static PyObject *_wrap_wxPoint2D_Get(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPoint2D_Get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_Get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPoint2D, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -7331,20 +7341,20 @@ static PyObject *_wrap_wxPoint2D_Get(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject * wxPoint2D_swigregister(PyObject *, PyObject *args) {
+static PyObject * Point2D_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPoint2D, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_wxDefaultPosition_set(PyObject *) {
-    PyErr_SetString(PyExc_TypeError,"Variable wxDefaultPosition is read-only.");
+static int _wrap_DefaultPosition_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable DefaultPosition is read-only.");
     return 1;
 }
 
 
-static PyObject *_wrap_wxDefaultPosition_get(void) {
+static PyObject *_wrap_DefaultPosition_get(void) {
     PyObject *pyobj;
     
     pyobj = SWIG_NewPointerObj((void *)(&wxDefaultPosition), SWIGTYPE_p_wxPoint, 0);
@@ -7352,13 +7362,13 @@ static PyObject *_wrap_wxDefaultPosition_get(void) {
 }
 
 
-static int _wrap_wxDefaultSize_set(PyObject *) {
-    PyErr_SetString(PyExc_TypeError,"Variable wxDefaultSize is read-only.");
+static int _wrap_DefaultSize_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable DefaultSize is read-only.");
     return 1;
 }
 
 
-static PyObject *_wrap_wxDefaultSize_get(void) {
+static PyObject *_wrap_DefaultSize_get(void) {
     PyObject *pyobj;
     
     pyobj = SWIG_NewPointerObj((void *)(&wxDefaultSize), SWIGTYPE_p_wxSize, 0);
@@ -7914,7 +7924,7 @@ static PyObject * InputStream_swigregister(PyObject *, PyObject *args) {
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxOutputStream_write(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OutputStream_write(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxOutputStream *arg1 = (wxOutputStream *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -7924,7 +7934,7 @@ static PyObject *_wrap_wxOutputStream_write(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "obj", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxOutputStream_write",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:OutputStream_write",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxOutputStream, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -7942,14 +7952,14 @@ static PyObject *_wrap_wxOutputStream_write(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject * wxOutputStream_swigregister(PyObject *, PyObject *args) {
+static PyObject * OutputStream_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxOutputStream, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxFSFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInputStream *arg1 = (wxInputStream *) 0 ;
     wxString *arg2 = 0 ;
@@ -7970,7 +7980,7 @@ static PyObject *_wrap_new_wxFSFile(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "stream",(char *) "loc",(char *) "mimetype",(char *) "anchor",(char *) "modif", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_wxFSFile",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_FSFile",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     {
         if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) {
             arg1 = wxPyCBInputStream_copy((wxPyCBInputStream*)temp1->m_wxis);
@@ -8048,7 +8058,7 @@ static PyObject *_wrap_new_wxFSFile(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_delete_wxFSFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_FSFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFSFile *arg1 = (wxFSFile *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8056,7 +8066,7 @@ static PyObject *_wrap_delete_wxFSFile(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxFSFile",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_FSFile",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFSFile, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -8073,7 +8083,7 @@ static PyObject *_wrap_delete_wxFSFile(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxFSFile_GetStream(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FSFile_GetStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFSFile *arg1 = (wxFSFile *) 0 ;
     wxInputStream *result;
@@ -8082,7 +8092,7 @@ static PyObject *_wrap_wxFSFile_GetStream(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFSFile_GetStream",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FSFile_GetStream",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFSFile, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -8106,7 +8116,7 @@ static PyObject *_wrap_wxFSFile_GetStream(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxFSFile_GetMimeType(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FSFile_GetMimeType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFSFile *arg1 = (wxFSFile *) 0 ;
     wxString *result;
@@ -8115,7 +8125,7 @@ static PyObject *_wrap_wxFSFile_GetMimeType(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFSFile_GetMimeType",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FSFile_GetMimeType",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFSFile, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -8141,7 +8151,7 @@ static PyObject *_wrap_wxFSFile_GetMimeType(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxFSFile_GetLocation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FSFile_GetLocation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFSFile *arg1 = (wxFSFile *) 0 ;
     wxString *result;
@@ -8150,7 +8160,7 @@ static PyObject *_wrap_wxFSFile_GetLocation(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFSFile_GetLocation",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FSFile_GetLocation",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFSFile, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -8176,7 +8186,7 @@ static PyObject *_wrap_wxFSFile_GetLocation(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxFSFile_GetAnchor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FSFile_GetAnchor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFSFile *arg1 = (wxFSFile *) 0 ;
     wxString *result;
@@ -8185,7 +8195,7 @@ static PyObject *_wrap_wxFSFile_GetAnchor(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFSFile_GetAnchor",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FSFile_GetAnchor",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFSFile, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -8211,7 +8221,7 @@ static PyObject *_wrap_wxFSFile_GetAnchor(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxFSFile_GetModificationTime(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FSFile_GetModificationTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFSFile *arg1 = (wxFSFile *) 0 ;
     wxDateTime result;
@@ -8220,7 +8230,7 @@ static PyObject *_wrap_wxFSFile_GetModificationTime(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFSFile_GetModificationTime",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FSFile_GetModificationTime",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFSFile, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -8241,7 +8251,7 @@ static PyObject *_wrap_wxFSFile_GetModificationTime(PyObject *, PyObject *args,
 }
 
 
-static PyObject * wxFSFile_swigregister(PyObject *, PyObject *args) {
+static PyObject * FSFile_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFSFile, obj);
@@ -8741,14 +8751,14 @@ static PyObject * FileSystemHandler_swigregister(PyObject *, PyObject *args) {
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxFileSystem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FileSystem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxFileSystem",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_FileSystem",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxFileSystem *)new wxFileSystem();
@@ -8765,7 +8775,7 @@ static PyObject *_wrap_new_wxFileSystem(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_delete_wxFileSystem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_FileSystem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8773,7 +8783,7 @@ static PyObject *_wrap_delete_wxFileSystem(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxFileSystem",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_FileSystem",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFileSystem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -8790,7 +8800,7 @@ static PyObject *_wrap_delete_wxFileSystem(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxFileSystem_ChangePathTo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_ChangePathTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     wxString *arg2 = 0 ;
@@ -8803,7 +8813,7 @@ static PyObject *_wrap_wxFileSystem_ChangePathTo(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "location",(char *) "is_dir", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxFileSystem_ChangePathTo",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FileSystem_ChangePathTo",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFileSystem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -8839,7 +8849,7 @@ static PyObject *_wrap_wxFileSystem_ChangePathTo(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxFileSystem_GetPath(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_GetPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     wxString result;
@@ -8848,7 +8858,7 @@ static PyObject *_wrap_wxFileSystem_GetPath(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFileSystem_GetPath",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FileSystem_GetPath",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFileSystem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -8871,7 +8881,7 @@ static PyObject *_wrap_wxFileSystem_GetPath(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxFileSystem_OpenFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_OpenFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     wxString *arg2 = 0 ;
@@ -8883,7 +8893,7 @@ static PyObject *_wrap_wxFileSystem_OpenFile(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "location", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxFileSystem_OpenFile",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileSystem_OpenFile",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFileSystem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -8915,7 +8925,7 @@ static PyObject *_wrap_wxFileSystem_OpenFile(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxFileSystem_FindFirst(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_FindFirst(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     wxString *arg2 = 0 ;
@@ -8929,7 +8939,7 @@ static PyObject *_wrap_wxFileSystem_FindFirst(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "spec",(char *) "flags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxFileSystem_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FileSystem_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFileSystem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -8971,7 +8981,7 @@ static PyObject *_wrap_wxFileSystem_FindFirst(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxFileSystem_FindNext(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_FindNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     wxString result;
@@ -8980,7 +8990,7 @@ static PyObject *_wrap_wxFileSystem_FindNext(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFileSystem_FindNext",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FileSystem_FindNext",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFileSystem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9003,7 +9013,7 @@ static PyObject *_wrap_wxFileSystem_FindNext(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxFileSystem_AddHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_AddHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystemHandler *arg1 = (wxFileSystemHandler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9011,7 +9021,7 @@ static PyObject *_wrap_wxFileSystem_AddHandler(PyObject *, PyObject *args, PyObj
         (char *) "handler", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFileSystem_AddHandler",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FileSystem_AddHandler",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFileSystemHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9028,13 +9038,13 @@ static PyObject *_wrap_wxFileSystem_AddHandler(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxFileSystem_CleanUpHandlers(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_CleanUpHandlers(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxFileSystem_CleanUpHandlers",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":FileSystem_CleanUpHandlers",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxFileSystem::CleanUpHandlers();
@@ -9049,7 +9059,7 @@ static PyObject *_wrap_wxFileSystem_CleanUpHandlers(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxFileSystem_FileNameToURL(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_FileNameToURL(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
@@ -9059,7 +9069,7 @@ static PyObject *_wrap_wxFileSystem_FileNameToURL(PyObject *, PyObject *args, Py
         (char *) "filename", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFileSystem_FileNameToURL",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FileSystem_FileNameToURL",kwnames,&obj0)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
@@ -9093,7 +9103,7 @@ static PyObject *_wrap_wxFileSystem_FileNameToURL(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxFileSystem_URLToFileName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_URLToFileName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
@@ -9103,7 +9113,7 @@ static PyObject *_wrap_wxFileSystem_URLToFileName(PyObject *, PyObject *args, Py
         (char *) "url", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFileSystem_URLToFileName",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FileSystem_URLToFileName",kwnames,&obj0)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
@@ -9111,7 +9121,7 @@ static PyObject *_wrap_wxFileSystem_URLToFileName(PyObject *, PyObject *args, Py
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = wxFileSystem_URLToFileName((wxString const &)*arg1);
+        result = FileSystem_URLToFileName((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -9137,21 +9147,21 @@ static PyObject *_wrap_wxFileSystem_URLToFileName(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject * wxFileSystem_swigregister(PyObject *, PyObject *args) {
+static PyObject * FileSystem_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFileSystem, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxInternetFSHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_InternetFSHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInternetFSHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxInternetFSHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_InternetFSHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxInternetFSHandler *)new wxInternetFSHandler();
@@ -9166,7 +9176,7 @@ static PyObject *_wrap_new_wxInternetFSHandler(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxInternetFSHandler_CanOpen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInternetFSHandler *arg1 = (wxInternetFSHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -9178,7 +9188,7 @@ static PyObject *_wrap_wxInternetFSHandler_CanOpen(PyObject *, PyObject *args, P
         (char *) "self",(char *) "location", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxInternetFSHandler_CanOpen",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:InternetFSHandler_CanOpen",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxInternetFSHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9210,7 +9220,7 @@ static PyObject *_wrap_wxInternetFSHandler_CanOpen(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxInternetFSHandler_OpenFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInternetFSHandler *arg1 = (wxInternetFSHandler *) 0 ;
     wxFileSystem *arg2 = 0 ;
@@ -9224,7 +9234,7 @@ static PyObject *_wrap_wxInternetFSHandler_OpenFile(PyObject *, PyObject *args,
         (char *) "self",(char *) "fs",(char *) "location", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxInternetFSHandler_OpenFile",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:InternetFSHandler_OpenFile",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxInternetFSHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9264,21 +9274,21 @@ static PyObject *_wrap_wxInternetFSHandler_OpenFile(PyObject *, PyObject *args,
 }
 
 
-static PyObject * wxInternetFSHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * InternetFSHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxInternetFSHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxZipFSHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ZipFSHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxZipFSHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxZipFSHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_ZipFSHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxZipFSHandler *)new wxZipFSHandler();
@@ -9293,7 +9303,7 @@ static PyObject *_wrap_new_wxZipFSHandler(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxZipFSHandler_CanOpen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxZipFSHandler *arg1 = (wxZipFSHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -9305,7 +9315,7 @@ static PyObject *_wrap_wxZipFSHandler_CanOpen(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "location", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxZipFSHandler_CanOpen",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ZipFSHandler_CanOpen",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxZipFSHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9337,7 +9347,7 @@ static PyObject *_wrap_wxZipFSHandler_CanOpen(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxZipFSHandler_OpenFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxZipFSHandler *arg1 = (wxZipFSHandler *) 0 ;
     wxFileSystem *arg2 = 0 ;
@@ -9351,7 +9361,7 @@ static PyObject *_wrap_wxZipFSHandler_OpenFile(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "fs",(char *) "location", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxZipFSHandler_OpenFile",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ZipFSHandler_OpenFile",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxZipFSHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9391,7 +9401,7 @@ static PyObject *_wrap_wxZipFSHandler_OpenFile(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxZipFSHandler_FindFirst(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ZipFSHandler_FindFirst(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxZipFSHandler *arg1 = (wxZipFSHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -9405,7 +9415,7 @@ static PyObject *_wrap_wxZipFSHandler_FindFirst(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "spec",(char *) "flags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxZipFSHandler_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ZipFSHandler_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxZipFSHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9447,7 +9457,7 @@ static PyObject *_wrap_wxZipFSHandler_FindFirst(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxZipFSHandler_FindNext(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ZipFSHandler_FindNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxZipFSHandler *arg1 = (wxZipFSHandler *) 0 ;
     wxString result;
@@ -9456,7 +9466,7 @@ static PyObject *_wrap_wxZipFSHandler_FindNext(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxZipFSHandler_FindNext",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ZipFSHandler_FindNext",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxZipFSHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9479,7 +9489,7 @@ static PyObject *_wrap_wxZipFSHandler_FindNext(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject * wxZipFSHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * ZipFSHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxZipFSHandler, obj);
@@ -9632,14 +9642,14 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_Data(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_new_wxMemoryFSHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MemoryFSHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMemoryFSHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxMemoryFSHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_MemoryFSHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxMemoryFSHandler *)new wxMemoryFSHandler();
@@ -9654,7 +9664,7 @@ static PyObject *_wrap_new_wxMemoryFSHandler(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMemoryFSHandler_RemoveFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MemoryFSHandler_RemoveFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = false ;
@@ -9663,7 +9673,7 @@ static PyObject *_wrap_wxMemoryFSHandler_RemoveFile(PyObject *, PyObject *args,
         (char *) "filename", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMemoryFSHandler_RemoveFile",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MemoryFSHandler_RemoveFile",kwnames,&obj0)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
@@ -9691,7 +9701,7 @@ static PyObject *_wrap_wxMemoryFSHandler_RemoveFile(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxMemoryFSHandler_CanOpen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMemoryFSHandler *arg1 = (wxMemoryFSHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -9703,7 +9713,7 @@ static PyObject *_wrap_wxMemoryFSHandler_CanOpen(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "location", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMemoryFSHandler_CanOpen",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryFSHandler_CanOpen",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMemoryFSHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9735,7 +9745,7 @@ static PyObject *_wrap_wxMemoryFSHandler_CanOpen(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxMemoryFSHandler_OpenFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMemoryFSHandler *arg1 = (wxMemoryFSHandler *) 0 ;
     wxFileSystem *arg2 = 0 ;
@@ -9749,7 +9759,7 @@ static PyObject *_wrap_wxMemoryFSHandler_OpenFile(PyObject *, PyObject *args, Py
         (char *) "self",(char *) "fs",(char *) "location", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMemoryFSHandler_OpenFile",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MemoryFSHandler_OpenFile",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMemoryFSHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9789,7 +9799,7 @@ static PyObject *_wrap_wxMemoryFSHandler_OpenFile(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxMemoryFSHandler_FindFirst(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MemoryFSHandler_FindFirst(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMemoryFSHandler *arg1 = (wxMemoryFSHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -9803,7 +9813,7 @@ static PyObject *_wrap_wxMemoryFSHandler_FindFirst(PyObject *, PyObject *args, P
         (char *) "self",(char *) "spec",(char *) "flags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxMemoryFSHandler_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:MemoryFSHandler_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMemoryFSHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9845,7 +9855,7 @@ static PyObject *_wrap_wxMemoryFSHandler_FindFirst(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxMemoryFSHandler_FindNext(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MemoryFSHandler_FindNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMemoryFSHandler *arg1 = (wxMemoryFSHandler *) 0 ;
     wxString result;
@@ -9854,7 +9864,7 @@ static PyObject *_wrap_wxMemoryFSHandler_FindNext(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMemoryFSHandler_FindNext",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MemoryFSHandler_FindNext",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMemoryFSHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9877,14 +9887,14 @@ static PyObject *_wrap_wxMemoryFSHandler_FindNext(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject * wxMemoryFSHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * MemoryFSHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMemoryFSHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxImageHandler_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString result;
@@ -9893,7 +9903,7 @@ static PyObject *_wrap_wxImageHandler_GetName(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImageHandler_GetName",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageHandler_GetName",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9916,7 +9926,7 @@ static PyObject *_wrap_wxImageHandler_GetName(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxImageHandler_GetExtension(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_GetExtension(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString result;
@@ -9925,7 +9935,7 @@ static PyObject *_wrap_wxImageHandler_GetExtension(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImageHandler_GetExtension",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageHandler_GetExtension",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9948,7 +9958,7 @@ static PyObject *_wrap_wxImageHandler_GetExtension(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxImageHandler_GetType(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_GetType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     long result;
@@ -9957,7 +9967,7 @@ static PyObject *_wrap_wxImageHandler_GetType(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImageHandler_GetType",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageHandler_GetType",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -9976,7 +9986,7 @@ static PyObject *_wrap_wxImageHandler_GetType(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxImageHandler_GetMimeType(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_GetMimeType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString result;
@@ -9985,7 +9995,7 @@ static PyObject *_wrap_wxImageHandler_GetMimeType(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImageHandler_GetMimeType",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageHandler_GetMimeType",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -10008,7 +10018,7 @@ static PyObject *_wrap_wxImageHandler_GetMimeType(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxImageHandler_CanRead(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_CanRead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -10020,7 +10030,7 @@ static PyObject *_wrap_wxImageHandler_CanRead(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImageHandler_CanRead",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_CanRead",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -10052,7 +10062,7 @@ static PyObject *_wrap_wxImageHandler_CanRead(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxImageHandler_SetName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_SetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -10063,7 +10073,7 @@ static PyObject *_wrap_wxImageHandler_SetName(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImageHandler_SetName",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_SetName",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -10093,7 +10103,7 @@ static PyObject *_wrap_wxImageHandler_SetName(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxImageHandler_SetExtension(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_SetExtension(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -10104,7 +10114,7 @@ static PyObject *_wrap_wxImageHandler_SetExtension(PyObject *, PyObject *args, P
         (char *) "self",(char *) "extension", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImageHandler_SetExtension",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_SetExtension",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -10134,7 +10144,7 @@ static PyObject *_wrap_wxImageHandler_SetExtension(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxImageHandler_SetType(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_SetType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     long arg2 ;
@@ -10144,7 +10154,7 @@ static PyObject *_wrap_wxImageHandler_SetType(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "type", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImageHandler_SetType",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_SetType",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -10165,7 +10175,7 @@ static PyObject *_wrap_wxImageHandler_SetType(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxImageHandler_SetMimeType(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_SetMimeType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -10176,7 +10186,7 @@ static PyObject *_wrap_wxImageHandler_SetMimeType(PyObject *, PyObject *args, Py
         (char *) "self",(char *) "mimetype", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImageHandler_SetMimeType",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_SetMimeType",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -10206,21 +10216,21 @@ static PyObject *_wrap_wxImageHandler_SetMimeType(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject * wxImageHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * ImageHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxImageHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxImageHistogram(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ImageHistogram(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHistogram *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxImageHistogram",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_ImageHistogram",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxImageHistogram *)new wxImageHistogram();
@@ -10235,11 +10245,11 @@ static PyObject *_wrap_new_wxImageHistogram(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxImageHistogram_MakeKey(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    unsigned char arg1 ;
-    unsigned char arg2 ;
-    unsigned char arg3 ;
+    byte arg1 ;
+    byte arg2 ;
+    byte arg3 ;
     unsigned long result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -10248,17 +10258,17 @@ static PyObject *_wrap_wxImageHistogram_MakeKey(PyObject *, PyObject *args, PyOb
         (char *) "r",(char *) "g",(char *) "b", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxImageHistogram_MakeKey",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageHistogram_MakeKey",kwnames,&obj0,&obj1,&obj2)) goto fail;
     {
-        arg1 = (unsigned char)(SWIG_As_unsigned_SS_char(obj0)); 
+        arg1 = (byte)(SWIG_As_unsigned_SS_char(obj0)); 
         if (SWIG_arg_fail(1)) SWIG_fail;
     }
     {
-        arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); 
+        arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); 
         if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); 
+        arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); 
         if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
@@ -10277,21 +10287,21 @@ static PyObject *_wrap_wxImageHistogram_MakeKey(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxImageHistogram_FindFirstUnusedColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHistogram *arg1 = (wxImageHistogram *) 0 ;
-    unsigned char *arg2 = (unsigned char *) 0 ;
-    unsigned char *arg3 = (unsigned char *) 0 ;
-    unsigned char *arg4 = (unsigned char *) 0 ;
-    unsigned char arg5 = (unsigned char) 1 ;
-    unsigned char arg6 = (unsigned char) 0 ;
-    unsigned char arg7 = (unsigned char) 0 ;
+    byte *arg2 = (byte *) 0 ;
+    byte *arg3 = (byte *) 0 ;
+    byte *arg4 = (byte *) 0 ;
+    byte arg5 = (byte) 1 ;
+    byte arg6 = (byte) 0 ;
+    byte arg7 = (byte) 0 ;
     bool result;
-    unsigned char temp2 ;
+    byte temp2 ;
     int res2 = 0 ;
-    unsigned char temp3 ;
+    byte temp3 ;
     int res3 = 0 ;
-    unsigned char temp4 ;
+    byte temp4 ;
     int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -10304,24 +10314,24 @@ static PyObject *_wrap_wxImageHistogram_FindFirstUnusedColour(PyObject *, PyObje
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
     arg4 = &temp4; res4 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:wxImageHistogram_FindFirstUnusedColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:ImageHistogram_FindFirstUnusedColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHistogram, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
-            arg5 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); 
+            arg5 = (byte)(SWIG_As_unsigned_SS_char(obj1)); 
             if (SWIG_arg_fail(5)) SWIG_fail;
         }
     }
     if (obj2) {
         {
-            arg6 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); 
+            arg6 = (byte)(SWIG_As_unsigned_SS_char(obj2)); 
             if (SWIG_arg_fail(6)) SWIG_fail;
         }
     }
     if (obj3) {
         {
-            arg7 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); 
+            arg7 = (byte)(SWIG_As_unsigned_SS_char(obj3)); 
             if (SWIG_arg_fail(7)) SWIG_fail;
         }
     }
@@ -10347,7 +10357,7 @@ static PyObject *_wrap_wxImageHistogram_FindFirstUnusedColour(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxImageHistogram_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHistogram_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHistogram *arg1 = (wxImageHistogram *) 0 ;
     unsigned long arg2 ;
@@ -10358,7 +10368,7 @@ static PyObject *_wrap_wxImageHistogram_GetCount(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "key", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImageHistogram_GetCount",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHistogram_GetCount",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHistogram, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -10381,12 +10391,12 @@ static PyObject *_wrap_wxImageHistogram_GetCount(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxImageHistogram_GetCountRGB(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHistogram_GetCountRGB(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHistogram *arg1 = (wxImageHistogram *) 0 ;
-    unsigned char arg2 ;
-    unsigned char arg3 ;
-    unsigned char arg4 ;
+    byte arg2 ;
+    byte arg3 ;
+    byte arg4 ;
     unsigned long result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -10396,19 +10406,19 @@ static PyObject *_wrap_wxImageHistogram_GetCountRGB(PyObject *, PyObject *args,
         (char *) "self",(char *) "r",(char *) "g",(char *) "b", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxImageHistogram_GetCountRGB",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ImageHistogram_GetCountRGB",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHistogram, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); 
+        arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); 
         if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); 
+        arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); 
         if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); 
+        arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); 
         if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
@@ -10427,7 +10437,7 @@ static PyObject *_wrap_wxImageHistogram_GetCountRGB(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxImageHistogram_GetCountColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHistogram_GetCountColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHistogram *arg1 = (wxImageHistogram *) 0 ;
     wxColour *arg2 = 0 ;
@@ -10439,7 +10449,7 @@ static PyObject *_wrap_wxImageHistogram_GetCountColour(PyObject *, PyObject *arg
         (char *) "self",(char *) "colour", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImageHistogram_GetCountColour",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHistogram_GetCountColour",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHistogram, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -10462,14 +10472,14 @@ static PyObject *_wrap_wxImageHistogram_GetCountColour(PyObject *, PyObject *arg
 }
 
 
-static PyObject * wxImageHistogram_swigregister(PyObject *, PyObject *args) {
+static PyObject * ImageHistogram_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxImageHistogram, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxImage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Image(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     long arg2 = (long) wxBITMAP_TYPE_ANY ;
@@ -10483,7 +10493,7 @@ static PyObject *_wrap_new_wxImage(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "name",(char *) "type",(char *) "index", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_wxImage",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_Image",kwnames,&obj0,&obj1,&obj2)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
@@ -10523,7 +10533,7 @@ static PyObject *_wrap_new_wxImage(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_delete_wxImage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Image(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10531,7 +10541,7 @@ static PyObject *_wrap_delete_wxImage(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxImage",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Image",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -10907,19 +10917,21 @@ static PyObject *_wrap_new_ImageFromDataWithAlpha(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxImage_Create(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
     int arg3 ;
+    bool arg4 = (bool) true ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "width",(char *) "height", NULL 
+        (char *) "self",(char *) "width",(char *) "height",(char *) "clear", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxImage_Create",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Image_Create",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -10930,9 +10942,15 @@ static PyObject *_wrap_wxImage_Create(PyObject *, PyObject *args, PyObject *kwar
         arg3 = (int)(SWIG_As_int(obj2)); 
         if (SWIG_arg_fail(3)) SWIG_fail;
     }
+    if (obj3) {
+        {
+            arg4 = (bool)(SWIG_As_bool(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
+        }
+    }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->Create(arg2,arg3);
+        (arg1)->Create(arg2,arg3,arg4);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -10944,7 +10962,7 @@ static PyObject *_wrap_wxImage_Create(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxImage_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10952,7 +10970,7 @@ static PyObject *_wrap_wxImage_Destroy(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_Destroy",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_Destroy",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -10969,7 +10987,7 @@ static PyObject *_wrap_wxImage_Destroy(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxImage_Scale(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Scale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
@@ -10982,7 +11000,7 @@ static PyObject *_wrap_wxImage_Scale(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxImage_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11011,7 +11029,7 @@ static PyObject *_wrap_wxImage_Scale(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxImage_ShrinkBy(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_ShrinkBy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
@@ -11024,7 +11042,7 @@ static PyObject *_wrap_wxImage_ShrinkBy(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "xFactor",(char *) "yFactor", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxImage_ShrinkBy",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_ShrinkBy",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11053,7 +11071,7 @@ static PyObject *_wrap_wxImage_ShrinkBy(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxImage_Rescale(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Rescale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
@@ -11066,7 +11084,7 @@ static PyObject *_wrap_wxImage_Rescale(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxImage_Rescale",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Rescale",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11094,7 +11112,7 @@ static PyObject *_wrap_wxImage_Rescale(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxImage_Resize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Resize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxSize *arg2 = 0 ;
@@ -11115,7 +11133,7 @@ static PyObject *_wrap_wxImage_Resize(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "size",(char *) "pos",(char *) "r",(char *) "g",(char *) "b", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:wxImage_Resize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:Image_Resize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11161,14 +11179,14 @@ static PyObject *_wrap_wxImage_Resize(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxImage_SetRGB(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetRGB(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
     int arg3 ;
-    unsigned char arg4 ;
-    unsigned char arg5 ;
-    unsigned char arg6 ;
+    byte arg4 ;
+    byte arg5 ;
+    byte arg6 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11179,7 +11197,7 @@ static PyObject *_wrap_wxImage_SetRGB(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "x",(char *) "y",(char *) "r",(char *) "g",(char *) "b", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:wxImage_SetRGB",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:Image_SetRGB",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11191,15 +11209,15 @@ static PyObject *_wrap_wxImage_SetRGB(PyObject *, PyObject *args, PyObject *kwar
         if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); 
+        arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); 
         if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (unsigned char)(SWIG_As_unsigned_SS_char(obj4)); 
+        arg5 = (byte)(SWIG_As_unsigned_SS_char(obj4)); 
         if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (unsigned char)(SWIG_As_unsigned_SS_char(obj5)); 
+        arg6 = (byte)(SWIG_As_unsigned_SS_char(obj5)); 
         if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
@@ -11216,13 +11234,13 @@ static PyObject *_wrap_wxImage_SetRGB(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxImage_SetRGBRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetRGBRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxRect *arg2 = 0 ;
-    unsigned char arg3 ;
-    unsigned char arg4 ;
-    unsigned char arg5 ;
+    byte arg3 ;
+    byte arg4 ;
+    byte arg5 ;
     wxRect temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -11233,7 +11251,7 @@ static PyObject *_wrap_wxImage_SetRGBRect(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "rect",(char *) "r",(char *) "g",(char *) "b", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:wxImage_SetRGBRect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Image_SetRGBRect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11241,15 +11259,15 @@ static PyObject *_wrap_wxImage_SetRGBRect(PyObject *, PyObject *args, PyObject *
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }
     {
-        arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); 
+        arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); 
         if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); 
+        arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); 
         if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (unsigned char)(SWIG_As_unsigned_SS_char(obj4)); 
+        arg5 = (byte)(SWIG_As_unsigned_SS_char(obj4)); 
         if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
@@ -11266,12 +11284,12 @@ static PyObject *_wrap_wxImage_SetRGBRect(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxImage_GetRed(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetRed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
     int arg3 ;
-    unsigned char result;
+    byte result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11279,7 +11297,7 @@ static PyObject *_wrap_wxImage_GetRed(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxImage_GetRed",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetRed",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11292,7 +11310,7 @@ static PyObject *_wrap_wxImage_GetRed(PyObject *, PyObject *args, PyObject *kwar
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (unsigned char)(arg1)->GetRed(arg2,arg3);
+        result = (byte)(arg1)->GetRed(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -11306,12 +11324,12 @@ static PyObject *_wrap_wxImage_GetRed(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxImage_GetGreen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetGreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
     int arg3 ;
-    unsigned char result;
+    byte result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11319,7 +11337,7 @@ static PyObject *_wrap_wxImage_GetGreen(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxImage_GetGreen",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetGreen",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11332,7 +11350,7 @@ static PyObject *_wrap_wxImage_GetGreen(PyObject *, PyObject *args, PyObject *kw
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (unsigned char)(arg1)->GetGreen(arg2,arg3);
+        result = (byte)(arg1)->GetGreen(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -11346,12 +11364,12 @@ static PyObject *_wrap_wxImage_GetGreen(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxImage_GetBlue(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetBlue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
     int arg3 ;
-    unsigned char result;
+    byte result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11359,7 +11377,7 @@ static PyObject *_wrap_wxImage_GetBlue(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxImage_GetBlue",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetBlue",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11372,7 +11390,7 @@ static PyObject *_wrap_wxImage_GetBlue(PyObject *, PyObject *args, PyObject *kwa
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (unsigned char)(arg1)->GetBlue(arg2,arg3);
+        result = (byte)(arg1)->GetBlue(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -11386,12 +11404,12 @@ static PyObject *_wrap_wxImage_GetBlue(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxImage_SetAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
     int arg3 ;
-    unsigned char arg4 ;
+    byte arg4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11400,7 +11418,7 @@ static PyObject *_wrap_wxImage_SetAlpha(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "x",(char *) "y",(char *) "alpha", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxImage_SetAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_SetAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11412,7 +11430,7 @@ static PyObject *_wrap_wxImage_SetAlpha(PyObject *, PyObject *args, PyObject *kw
         if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); 
+        arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); 
         if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
@@ -11429,12 +11447,12 @@ static PyObject *_wrap_wxImage_SetAlpha(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxImage_GetAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
     int arg3 ;
-    unsigned char result;
+    byte result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11442,7 +11460,7 @@ static PyObject *_wrap_wxImage_GetAlpha(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxImage_GetAlpha",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetAlpha",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11455,7 +11473,7 @@ static PyObject *_wrap_wxImage_GetAlpha(PyObject *, PyObject *args, PyObject *kw
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (unsigned char)(arg1)->GetAlpha(arg2,arg3);
+        result = (byte)(arg1)->GetAlpha(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -11469,7 +11487,7 @@ static PyObject *_wrap_wxImage_GetAlpha(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxImage_HasAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_HasAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     bool result;
@@ -11478,7 +11496,7 @@ static PyObject *_wrap_wxImage_HasAlpha(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_HasAlpha",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_HasAlpha",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11497,7 +11515,7 @@ static PyObject *_wrap_wxImage_HasAlpha(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxImage_InitAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_InitAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11505,7 +11523,7 @@ static PyObject *_wrap_wxImage_InitAlpha(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_InitAlpha",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_InitAlpha",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11522,7 +11540,55 @@ static PyObject *_wrap_wxImage_InitAlpha(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxImage_FindFirstUnusedColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_IsTransparent(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxImage *arg1 = (wxImage *) 0 ;
+    int arg2 ;
+    int arg3 ;
+    byte arg4 = (byte) wxIMAGE_ALPHA_THRESHOLD ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "x",(char *) "y",(char *) "threshold", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Image_IsTransparent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    {
+        arg3 = (int)(SWIG_As_int(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
+        }
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)((wxImage const *)arg1)->IsTransparent(arg2,arg3,arg4);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     byte *arg2 = (byte *) 0 ;
@@ -11549,7 +11615,7 @@ static PyObject *_wrap_wxImage_FindFirstUnusedColour(PyObject *, PyObject *args,
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
     arg4 = &temp4; res4 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:wxImage_FindFirstUnusedColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Image_FindFirstUnusedColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -11592,10 +11658,10 @@ static PyObject *_wrap_wxImage_FindFirstUnusedColour(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxImage_ConvertAlphaToMask(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
-    byte arg2 = (byte) 128 ;
+    byte arg2 = (byte) wxIMAGE_ALPHA_THRESHOLD ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -11603,7 +11669,7 @@ static PyObject *_wrap_wxImage_ConvertAlphaToMask(PyObject *, PyObject *args, Py
         (char *) "self",(char *) "threshold", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxImage_ConvertAlphaToMask",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_ConvertAlphaToMask",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -11628,12 +11694,12 @@ static PyObject *_wrap_wxImage_ConvertAlphaToMask(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxImage_ConvertColourToAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_ConvertColourToAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
-    unsigned char arg2 ;
-    unsigned char arg3 ;
-    unsigned char arg4 ;
+    byte arg2 ;
+    byte arg3 ;
+    byte arg4 ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -11643,19 +11709,19 @@ static PyObject *_wrap_wxImage_ConvertColourToAlpha(PyObject *, PyObject *args,
         (char *) "self",(char *) "r",(char *) "g",(char *) "b", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxImage_ConvertColourToAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertColourToAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); 
+        arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); 
         if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); 
+        arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); 
         if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); 
+        arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); 
         if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
@@ -11674,7 +11740,7 @@ static PyObject *_wrap_wxImage_ConvertColourToAlpha(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxImage_SetMaskFromImage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetMaskFromImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxImage *arg2 = 0 ;
@@ -11691,7 +11757,7 @@ static PyObject *_wrap_wxImage_SetMaskFromImage(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "mask",(char *) "mr",(char *) "mg",(char *) "mb", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:wxImage_SetMaskFromImage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Image_SetMaskFromImage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11730,17 +11796,17 @@ static PyObject *_wrap_wxImage_SetMaskFromImage(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxImage_CanRead(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_CanRead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool result;
     bool temp1 = false ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
-        (char *) "name", NULL 
+        (char *) "filename", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_CanRead",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_CanRead",kwnames,&obj0)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
@@ -11770,7 +11836,7 @@ static PyObject *_wrap_wxImage_CanRead(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxImage_GetImageCount(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetImageCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     long arg2 = (long) wxBITMAP_TYPE_ANY ;
@@ -11779,10 +11845,10 @@ static PyObject *_wrap_wxImage_GetImageCount(PyObject *, PyObject *args, PyObjec
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "name",(char *) "type", NULL 
+        (char *) "filename",(char *) "type", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxImage_GetImageCount",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_GetImageCount",kwnames,&obj0,&obj1)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
@@ -11818,7 +11884,7 @@ static PyObject *_wrap_wxImage_GetImageCount(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxImage_LoadFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_LoadFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -11834,7 +11900,7 @@ static PyObject *_wrap_wxImage_LoadFile(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "name",(char *) "type",(char *) "index", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:wxImage_LoadFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Image_LoadFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11878,7 +11944,7 @@ static PyObject *_wrap_wxImage_LoadFile(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxImage_LoadMimeFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_LoadMimeFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -11895,7 +11961,7 @@ static PyObject *_wrap_wxImage_LoadMimeFile(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "name",(char *) "mimetype",(char *) "index", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:wxImage_LoadMimeFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Image_LoadMimeFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11946,7 +12012,7 @@ static PyObject *_wrap_wxImage_LoadMimeFile(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxImage_SaveFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SaveFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -11960,7 +12026,7 @@ static PyObject *_wrap_wxImage_SaveFile(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "name",(char *) "type", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxImage_SaveFile",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_SaveFile",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -11996,7 +12062,7 @@ static PyObject *_wrap_wxImage_SaveFile(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxImage_SaveMimeFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SaveMimeFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -12011,7 +12077,7 @@ static PyObject *_wrap_wxImage_SaveMimeFile(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "name",(char *) "mimetype", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxImage_SaveMimeFile",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_SaveMimeFile",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12056,7 +12122,7 @@ static PyObject *_wrap_wxImage_SaveMimeFile(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxImage_CanReadStream(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_CanReadStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInputStream *arg1 = 0 ;
     bool result;
@@ -12067,7 +12133,7 @@ static PyObject *_wrap_wxImage_CanReadStream(PyObject *, PyObject *args, PyObjec
         (char *) "stream", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_CanReadStream",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_CanReadStream",kwnames,&obj0)) goto fail;
     {
         if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) {
             arg1 = temp1->m_wxis;
@@ -12104,7 +12170,7 @@ static PyObject *_wrap_wxImage_CanReadStream(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxImage_LoadStream(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_LoadStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxInputStream *arg2 = 0 ;
@@ -12121,7 +12187,7 @@ static PyObject *_wrap_wxImage_LoadStream(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "stream",(char *) "type",(char *) "index", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:wxImage_LoadStream",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Image_LoadStream",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12172,7 +12238,7 @@ static PyObject *_wrap_wxImage_LoadStream(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxImage_LoadMimeStream(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_LoadMimeStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxInputStream *arg2 = 0 ;
@@ -12190,7 +12256,7 @@ static PyObject *_wrap_wxImage_LoadMimeStream(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "stream",(char *) "mimetype",(char *) "index", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:wxImage_LoadMimeStream",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Image_LoadMimeStream",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12248,7 +12314,7 @@ static PyObject *_wrap_wxImage_LoadMimeStream(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxImage_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     bool result;
@@ -12257,7 +12323,7 @@ static PyObject *_wrap_wxImage_Ok(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_Ok",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_Ok",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12276,7 +12342,7 @@ static PyObject *_wrap_wxImage_Ok(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_wxImage_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int result;
@@ -12285,7 +12351,7 @@ static PyObject *_wrap_wxImage_GetWidth(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_GetWidth",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetWidth",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12304,7 +12370,7 @@ static PyObject *_wrap_wxImage_GetWidth(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxImage_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int result;
@@ -12313,7 +12379,7 @@ static PyObject *_wrap_wxImage_GetHeight(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_GetHeight",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetHeight",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12332,7 +12398,7 @@ static PyObject *_wrap_wxImage_GetHeight(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxImage_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxSize result;
@@ -12341,7 +12407,7 @@ static PyObject *_wrap_wxImage_GetSize(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_GetSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12362,7 +12428,7 @@ static PyObject *_wrap_wxImage_GetSize(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxImage_GetSubImage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetSubImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxRect *arg2 = 0 ;
@@ -12374,7 +12440,7 @@ static PyObject *_wrap_wxImage_GetSubImage(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImage_GetSubImage",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_GetSubImage",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12399,7 +12465,7 @@ static PyObject *_wrap_wxImage_GetSubImage(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxImage_Size(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Size(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxSize *arg2 = 0 ;
@@ -12420,7 +12486,7 @@ static PyObject *_wrap_wxImage_Size(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self",(char *) "size",(char *) "pos",(char *) "r",(char *) "g",(char *) "b", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:wxImage_Size",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:Image_Size",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12467,7 +12533,7 @@ static PyObject *_wrap_wxImage_Size(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxImage_Copy(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Copy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     SwigValueWrapper<wxImage > result;
@@ -12476,7 +12542,7 @@ static PyObject *_wrap_wxImage_Copy(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_Copy",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_Copy",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12497,7 +12563,7 @@ static PyObject *_wrap_wxImage_Copy(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxImage_Paste(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Paste(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxImage *arg2 = 0 ;
@@ -12511,7 +12577,7 @@ static PyObject *_wrap_wxImage_Paste(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "image",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxImage_Paste",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_Paste",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12544,7 +12610,7 @@ static PyObject *_wrap_wxImage_Paste(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxImage_GetData(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject *result;
@@ -12553,7 +12619,7 @@ static PyObject *_wrap_wxImage_GetData(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_GetData",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetData",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12570,7 +12636,7 @@ static PyObject *_wrap_wxImage_GetData(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxImage_SetData(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     buffer arg2 ;
@@ -12581,7 +12647,7 @@ static PyObject *_wrap_wxImage_SetData(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "data", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImage_SetData",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_SetData",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12601,7 +12667,7 @@ static PyObject *_wrap_wxImage_SetData(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxImage_GetDataBuffer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetDataBuffer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject *result;
@@ -12610,7 +12676,7 @@ static PyObject *_wrap_wxImage_GetDataBuffer(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_GetDataBuffer",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetDataBuffer",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12627,7 +12693,7 @@ static PyObject *_wrap_wxImage_GetDataBuffer(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxImage_SetDataBuffer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetDataBuffer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     buffer arg2 ;
@@ -12638,7 +12704,7 @@ static PyObject *_wrap_wxImage_SetDataBuffer(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "data", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImage_SetDataBuffer",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_SetDataBuffer",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12658,7 +12724,7 @@ static PyObject *_wrap_wxImage_SetDataBuffer(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxImage_GetAlphaData(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetAlphaData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject *result;
@@ -12667,7 +12733,7 @@ static PyObject *_wrap_wxImage_GetAlphaData(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_GetAlphaData",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetAlphaData",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12684,7 +12750,7 @@ static PyObject *_wrap_wxImage_GetAlphaData(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxImage_SetAlphaData(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetAlphaData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     buffer arg2 ;
@@ -12695,7 +12761,7 @@ static PyObject *_wrap_wxImage_SetAlphaData(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "alpha", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImage_SetAlphaData",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_SetAlphaData",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12715,7 +12781,7 @@ static PyObject *_wrap_wxImage_SetAlphaData(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxImage_GetAlphaBuffer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetAlphaBuffer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject *result;
@@ -12724,7 +12790,7 @@ static PyObject *_wrap_wxImage_GetAlphaBuffer(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_GetAlphaBuffer",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetAlphaBuffer",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12741,7 +12807,7 @@ static PyObject *_wrap_wxImage_GetAlphaBuffer(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxImage_SetAlphaBuffer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetAlphaBuffer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     buffer arg2 ;
@@ -12752,7 +12818,7 @@ static PyObject *_wrap_wxImage_SetAlphaBuffer(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "alpha", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImage_SetAlphaBuffer",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_SetAlphaBuffer",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12772,12 +12838,12 @@ static PyObject *_wrap_wxImage_SetAlphaBuffer(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxImage_SetMaskColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetMaskColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
-    unsigned char arg2 ;
-    unsigned char arg3 ;
-    unsigned char arg4 ;
+    byte arg2 ;
+    byte arg3 ;
+    byte arg4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -12786,19 +12852,19 @@ static PyObject *_wrap_wxImage_SetMaskColour(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "r",(char *) "g",(char *) "b", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxImage_SetMaskColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_SetMaskColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); 
+        arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); 
         if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); 
+        arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); 
         if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); 
+        arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); 
         if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
@@ -12815,17 +12881,17 @@ static PyObject *_wrap_wxImage_SetMaskColour(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxImage_GetOrFindMaskColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetOrFindMaskColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
-    unsigned char *arg2 = (unsigned char *) 0 ;
-    unsigned char *arg3 = (unsigned char *) 0 ;
-    unsigned char *arg4 = (unsigned char *) 0 ;
-    unsigned char temp2 ;
+    byte *arg2 = (byte *) 0 ;
+    byte *arg3 = (byte *) 0 ;
+    byte *arg4 = (byte *) 0 ;
+    byte temp2 ;
     int res2 = 0 ;
-    unsigned char temp3 ;
+    byte temp3 ;
     int res3 = 0 ;
-    unsigned char temp4 ;
+    byte temp4 ;
     int res4 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -12835,7 +12901,7 @@ static PyObject *_wrap_wxImage_GetOrFindMaskColour(PyObject *, PyObject *args, P
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
     arg4 = &temp4; res4 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_GetOrFindMaskColour",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetOrFindMaskColour",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -12858,21 +12924,21 @@ static PyObject *_wrap_wxImage_GetOrFindMaskColour(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxImage_GetMaskRed(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetMaskRed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
-    unsigned char result;
+    byte result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_GetMaskRed",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetMaskRed",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (unsigned char)(arg1)->GetMaskRed();
+        result = (byte)(arg1)->GetMaskRed();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -12886,21 +12952,21 @@ static PyObject *_wrap_wxImage_GetMaskRed(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxImage_GetMaskGreen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetMaskGreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
-    unsigned char result;
+    byte result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_GetMaskGreen",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetMaskGreen",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (unsigned char)(arg1)->GetMaskGreen();
+        result = (byte)(arg1)->GetMaskGreen();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -12914,21 +12980,21 @@ static PyObject *_wrap_wxImage_GetMaskGreen(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxImage_GetMaskBlue(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetMaskBlue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
-    unsigned char result;
+    byte result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_GetMaskBlue",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetMaskBlue",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (unsigned char)(arg1)->GetMaskBlue();
+        result = (byte)(arg1)->GetMaskBlue();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -12942,7 +13008,7 @@ static PyObject *_wrap_wxImage_GetMaskBlue(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxImage_SetMask(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     bool arg2 = (bool) true ;
@@ -12952,7 +13018,7 @@ static PyObject *_wrap_wxImage_SetMask(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "mask", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxImage_SetMask",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_SetMask",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -12975,7 +13041,7 @@ static PyObject *_wrap_wxImage_SetMask(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxImage_HasMask(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_HasMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     bool result;
@@ -12984,7 +13050,7 @@ static PyObject *_wrap_wxImage_HasMask(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_HasMask",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_HasMask",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -13003,7 +13069,7 @@ static PyObject *_wrap_wxImage_HasMask(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxImage_Rotate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Rotate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     double arg2 ;
@@ -13021,7 +13087,7 @@ static PyObject *_wrap_wxImage_Rotate(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "angle",(char *) "centre_of_rotation",(char *) "interpolating",(char *) "offset_after_rotation", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:wxImage_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Image_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -13060,7 +13126,7 @@ static PyObject *_wrap_wxImage_Rotate(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxImage_Rotate90(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Rotate90(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     bool arg2 = (bool) true ;
@@ -13071,7 +13137,7 @@ static PyObject *_wrap_wxImage_Rotate90(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "clockwise", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxImage_Rotate90",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_Rotate90",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -13098,7 +13164,7 @@ static PyObject *_wrap_wxImage_Rotate90(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxImage_Mirror(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Mirror(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     bool arg2 = (bool) true ;
@@ -13109,7 +13175,7 @@ static PyObject *_wrap_wxImage_Mirror(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "horizontally", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxImage_Mirror",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_Mirror",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -13136,15 +13202,15 @@ static PyObject *_wrap_wxImage_Mirror(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxImage_Replace(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Replace(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
-    unsigned char arg2 ;
-    unsigned char arg3 ;
-    unsigned char arg4 ;
-    unsigned char arg5 ;
-    unsigned char arg6 ;
-    unsigned char arg7 ;
+    byte arg2 ;
+    byte arg3 ;
+    byte arg4 ;
+    byte arg5 ;
+    byte arg6 ;
+    byte arg7 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -13156,31 +13222,31 @@ static PyObject *_wrap_wxImage_Replace(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "r1",(char *) "g1",(char *) "b1",(char *) "r2",(char *) "g2",(char *) "b2", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:wxImage_Replace",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:Image_Replace",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); 
+        arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); 
         if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); 
+        arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); 
         if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); 
+        arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); 
         if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
-        arg5 = (unsigned char)(SWIG_As_unsigned_SS_char(obj4)); 
+        arg5 = (byte)(SWIG_As_unsigned_SS_char(obj4)); 
         if (SWIG_arg_fail(5)) SWIG_fail;
     }
     {
-        arg6 = (unsigned char)(SWIG_As_unsigned_SS_char(obj5)); 
+        arg6 = (byte)(SWIG_As_unsigned_SS_char(obj5)); 
         if (SWIG_arg_fail(6)) SWIG_fail;
     }
     {
-        arg7 = (unsigned char)(SWIG_As_unsigned_SS_char(obj6)); 
+        arg7 = (byte)(SWIG_As_unsigned_SS_char(obj6)); 
         if (SWIG_arg_fail(7)) SWIG_fail;
     }
     {
@@ -13197,12 +13263,12 @@ static PyObject *_wrap_wxImage_Replace(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxImage_ConvertToMono(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_ConvertToMono(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
-    unsigned char arg2 ;
-    unsigned char arg3 ;
-    unsigned char arg4 ;
+    byte arg2 ;
+    byte arg3 ;
+    byte arg4 ;
     SwigValueWrapper<wxImage > result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -13212,19 +13278,19 @@ static PyObject *_wrap_wxImage_ConvertToMono(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "r",(char *) "g",(char *) "b", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxImage_ConvertToMono",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertToMono",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); 
+        arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); 
         if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); 
+        arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); 
         if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); 
+        arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); 
         if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
@@ -13245,7 +13311,7 @@ static PyObject *_wrap_wxImage_ConvertToMono(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxImage_SetOption(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetOption(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -13259,7 +13325,7 @@ static PyObject *_wrap_wxImage_SetOption(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "name",(char *) "value", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxImage_SetOption",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_SetOption",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -13302,7 +13368,7 @@ static PyObject *_wrap_wxImage_SetOption(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxImage_SetOptionInt(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetOptionInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -13315,7 +13381,7 @@ static PyObject *_wrap_wxImage_SetOptionInt(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "name",(char *) "value", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxImage_SetOptionInt",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_SetOptionInt",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -13349,7 +13415,7 @@ static PyObject *_wrap_wxImage_SetOptionInt(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxImage_GetOption(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetOption(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -13361,7 +13427,7 @@ static PyObject *_wrap_wxImage_GetOption(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImage_GetOption",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_GetOption",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -13397,7 +13463,7 @@ static PyObject *_wrap_wxImage_GetOption(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxImage_GetOptionInt(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetOptionInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -13409,7 +13475,7 @@ static PyObject *_wrap_wxImage_GetOptionInt(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImage_GetOptionInt",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_GetOptionInt",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -13441,7 +13507,7 @@ static PyObject *_wrap_wxImage_GetOptionInt(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxImage_HasOption(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_HasOption(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -13453,7 +13519,7 @@ static PyObject *_wrap_wxImage_HasOption(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImage_HasOption",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_HasOption",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -13485,7 +13551,7 @@ static PyObject *_wrap_wxImage_HasOption(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxImage_CountColours(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_CountColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     unsigned long arg2 = (unsigned long) (unsigned long) -1 ;
@@ -13496,7 +13562,7 @@ static PyObject *_wrap_wxImage_CountColours(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "stopafter", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxImage_CountColours",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_CountColours",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -13521,7 +13587,7 @@ static PyObject *_wrap_wxImage_CountColours(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxImage_ComputeHistogram(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_ComputeHistogram(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxImageHistogram *arg2 = 0 ;
@@ -13532,7 +13598,7 @@ static PyObject *_wrap_wxImage_ComputeHistogram(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "h", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxImage_ComputeHistogram",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_ComputeHistogram",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -13559,7 +13625,7 @@ static PyObject *_wrap_wxImage_ComputeHistogram(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxImage_AddHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_AddHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13567,7 +13633,7 @@ static PyObject *_wrap_wxImage_AddHandler(PyObject *, PyObject *args, PyObject *
         (char *) "handler", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_AddHandler",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_AddHandler",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -13584,7 +13650,7 @@ static PyObject *_wrap_wxImage_AddHandler(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxImage_InsertHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_InsertHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13592,7 +13658,7 @@ static PyObject *_wrap_wxImage_InsertHandler(PyObject *, PyObject *args, PyObjec
         (char *) "handler", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_InsertHandler",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_InsertHandler",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -13609,7 +13675,7 @@ static PyObject *_wrap_wxImage_InsertHandler(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxImage_RemoveHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_RemoveHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool result;
@@ -13619,7 +13685,7 @@ static PyObject *_wrap_wxImage_RemoveHandler(PyObject *, PyObject *args, PyObjec
         (char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxImage_RemoveHandler",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_RemoveHandler",kwnames,&obj0)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
@@ -13649,14 +13715,14 @@ static PyObject *_wrap_wxImage_RemoveHandler(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxImage_GetImageExtWildcard(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetImageExtWildcard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxImage_GetImageExtWildcard",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":Image_GetImageExtWildcard",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxImage::GetImageExtWildcard();
@@ -13677,7 +13743,7 @@ static PyObject *_wrap_wxImage_GetImageExtWildcard(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxImage_ConvertToBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_ConvertToBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 = (int) -1 ;
@@ -13688,7 +13754,7 @@ static PyObject *_wrap_wxImage_ConvertToBitmap(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "depth", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxImage_ConvertToBitmap",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_ConvertToBitmap",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -13716,12 +13782,12 @@ static PyObject *_wrap_wxImage_ConvertToBitmap(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxImage_ConvertToMonoBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
-    unsigned char arg2 ;
-    unsigned char arg3 ;
-    unsigned char arg4 ;
+    byte arg2 ;
+    byte arg3 ;
+    byte arg4 ;
     wxBitmap result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -13731,19 +13797,19 @@ static PyObject *_wrap_wxImage_ConvertToMonoBitmap(PyObject *, PyObject *args, P
         (char *) "self",(char *) "red",(char *) "green",(char *) "blue", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxImage_ConvertToMonoBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertToMonoBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
-        arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); 
+        arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); 
         if (SWIG_arg_fail(2)) SWIG_fail;
     }
     {
-        arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); 
+        arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); 
         if (SWIG_arg_fail(3)) SWIG_fail;
     }
     {
-        arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); 
+        arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); 
         if (SWIG_arg_fail(4)) SWIG_fail;
     }
     {
@@ -13765,20 +13831,20 @@ static PyObject *_wrap_wxImage_ConvertToMonoBitmap(PyObject *, PyObject *args, P
 }
 
 
-static PyObject * wxImage_swigregister(PyObject *, PyObject *args) {
+static PyObject * Image_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxImage, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_wxNullImage_set(PyObject *) {
-    PyErr_SetString(PyExc_TypeError,"Variable wxNullImage is read-only.");
+static int _wrap_NullImage_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable NullImage is read-only.");
     return 1;
 }
 
 
-static PyObject *_wrap_wxNullImage_get(void) {
+static PyObject *_wrap_NullImage_get(void) {
     PyObject *pyobj;
     
     pyobj = SWIG_NewPointerObj((void *)(&wxNullImage), SWIGTYPE_p_wxImage, 0);
@@ -14086,14 +14152,14 @@ static PyObject *_wrap_IMAGE_OPTION_PNG_BITDEPTH_get(void) {
 }
 
 
-static PyObject *_wrap_new_wxBMPHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BMPHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBMPHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxBMPHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_BMPHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxBMPHandler *)new wxBMPHandler();
@@ -14108,21 +14174,21 @@ static PyObject *_wrap_new_wxBMPHandler(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxBMPHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * BMPHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBMPHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxICOHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ICOHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxICOHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxICOHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_ICOHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxICOHandler *)new wxICOHandler();
@@ -14137,21 +14203,21 @@ static PyObject *_wrap_new_wxICOHandler(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxICOHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * ICOHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxICOHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxCURHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CURHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCURHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxCURHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_CURHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxCURHandler *)new wxCURHandler();
@@ -14166,21 +14232,21 @@ static PyObject *_wrap_new_wxCURHandler(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxCURHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * CURHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCURHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxANIHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ANIHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxANIHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxANIHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_ANIHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxANIHandler *)new wxANIHandler();
@@ -14195,21 +14261,21 @@ static PyObject *_wrap_new_wxANIHandler(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxANIHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * ANIHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxANIHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxPNGHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PNGHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPNGHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxPNGHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PNGHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPNGHandler *)new wxPNGHandler();
@@ -14224,21 +14290,21 @@ static PyObject *_wrap_new_wxPNGHandler(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxPNGHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * PNGHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPNGHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxGIFHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GIFHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGIFHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxGIFHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_GIFHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxGIFHandler *)new wxGIFHandler();
@@ -14253,21 +14319,21 @@ static PyObject *_wrap_new_wxGIFHandler(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxGIFHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * GIFHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGIFHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxPCXHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PCXHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPCXHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxPCXHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PCXHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPCXHandler *)new wxPCXHandler();
@@ -14282,21 +14348,21 @@ static PyObject *_wrap_new_wxPCXHandler(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxPCXHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * PCXHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPCXHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxJPEGHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_JPEGHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJPEGHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxJPEGHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_JPEGHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxJPEGHandler *)new wxJPEGHandler();
@@ -14311,21 +14377,21 @@ static PyObject *_wrap_new_wxJPEGHandler(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject * wxJPEGHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * JPEGHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxJPEGHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxPNMHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PNMHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPNMHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxPNMHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PNMHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPNMHandler *)new wxPNMHandler();
@@ -14340,21 +14406,21 @@ static PyObject *_wrap_new_wxPNMHandler(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxPNMHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * PNMHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPNMHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxXPMHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_XPMHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXPMHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxXPMHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_XPMHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxXPMHandler *)new wxXPMHandler();
@@ -14369,21 +14435,21 @@ static PyObject *_wrap_new_wxXPMHandler(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxXPMHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * XPMHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxXPMHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxTIFFHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TIFFHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTIFFHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxTIFFHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_TIFFHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxTIFFHandler *)new wxTIFFHandler();
@@ -14398,14 +14464,14 @@ static PyObject *_wrap_new_wxTIFFHandler(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject * wxTIFFHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * TIFFHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTIFFHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxQuantize_Quantize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Quantize_Quantize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = 0 ;
     wxImage *arg2 = 0 ;
@@ -14420,7 +14486,7 @@ static PyObject *_wrap_wxQuantize_Quantize(PyObject *, PyObject *args, PyObject
         (char *) "src",(char *) "dest",(char *) "desiredNoColours",(char *) "flags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:wxQuantize_Quantize",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Quantize_Quantize",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     {
         SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0);
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -14451,7 +14517,7 @@ static PyObject *_wrap_wxQuantize_Quantize(PyObject *, PyObject *args, PyObject
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)wxQuantize_Quantize((wxImage const &)*arg1,*arg2,arg3,arg4);
+        result = (bool)Quantize_Quantize((wxImage const &)*arg1,*arg2,arg3,arg4);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -14465,21 +14531,21 @@ static PyObject *_wrap_wxQuantize_Quantize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject * wxQuantize_swigregister(PyObject *, PyObject *args) {
+static PyObject * Quantize_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxQuantize, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxEvtHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_EvtHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxEvtHandler",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_EvtHandler",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxEvtHandler *)new wxEvtHandler();
@@ -14494,7 +14560,7 @@ static PyObject *_wrap_new_wxEvtHandler(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxEvtHandler_GetNextHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_GetNextHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvtHandler *result;
@@ -14503,7 +14569,7 @@ static PyObject *_wrap_wxEvtHandler_GetNextHandler(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEvtHandler_GetNextHandler",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EvtHandler_GetNextHandler",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -14522,7 +14588,7 @@ static PyObject *_wrap_wxEvtHandler_GetNextHandler(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxEvtHandler_GetPreviousHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_GetPreviousHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvtHandler *result;
@@ -14531,7 +14597,7 @@ static PyObject *_wrap_wxEvtHandler_GetPreviousHandler(PyObject *, PyObject *arg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEvtHandler_GetPreviousHandler",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EvtHandler_GetPreviousHandler",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -14550,7 +14616,7 @@ static PyObject *_wrap_wxEvtHandler_GetPreviousHandler(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxEvtHandler_SetNextHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_SetNextHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) 0 ;
@@ -14560,7 +14626,7 @@ static PyObject *_wrap_wxEvtHandler_SetNextHandler(PyObject *, PyObject *args, P
         (char *) "self",(char *) "handler", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxEvtHandler_SetNextHandler",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler_SetNextHandler",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
@@ -14579,7 +14645,7 @@ static PyObject *_wrap_wxEvtHandler_SetNextHandler(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxEvtHandler_SetPreviousHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_SetPreviousHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) 0 ;
@@ -14589,7 +14655,7 @@ static PyObject *_wrap_wxEvtHandler_SetPreviousHandler(PyObject *, PyObject *arg
         (char *) "self",(char *) "handler", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxEvtHandler_SetPreviousHandler",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler_SetPreviousHandler",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
@@ -14608,7 +14674,7 @@ static PyObject *_wrap_wxEvtHandler_SetPreviousHandler(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxEvtHandler_GetEvtHandlerEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_GetEvtHandlerEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     bool result;
@@ -14617,7 +14683,7 @@ static PyObject *_wrap_wxEvtHandler_GetEvtHandlerEnabled(PyObject *, PyObject *a
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEvtHandler_GetEvtHandlerEnabled",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EvtHandler_GetEvtHandlerEnabled",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -14636,7 +14702,7 @@ static PyObject *_wrap_wxEvtHandler_GetEvtHandlerEnabled(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxEvtHandler_SetEvtHandlerEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_SetEvtHandlerEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     bool arg2 ;
@@ -14646,7 +14712,7 @@ static PyObject *_wrap_wxEvtHandler_SetEvtHandlerEnabled(PyObject *, PyObject *a
         (char *) "self",(char *) "enabled", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxEvtHandler_SetEvtHandlerEnabled",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler_SetEvtHandlerEnabled",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -14667,7 +14733,7 @@ static PyObject *_wrap_wxEvtHandler_SetEvtHandlerEnabled(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxEvtHandler_ProcessEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_ProcessEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvent *arg2 = 0 ;
@@ -14678,7 +14744,7 @@ static PyObject *_wrap_wxEvtHandler_ProcessEvent(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "event", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxEvtHandler_ProcessEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler_ProcessEvent",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -14705,7 +14771,7 @@ static PyObject *_wrap_wxEvtHandler_ProcessEvent(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxEvtHandler_AddPendingEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_AddPendingEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvent *arg2 = 0 ;
@@ -14715,7 +14781,7 @@ static PyObject *_wrap_wxEvtHandler_AddPendingEvent(PyObject *, PyObject *args,
         (char *) "self",(char *) "event", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxEvtHandler_AddPendingEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler_AddPendingEvent",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -14740,7 +14806,7 @@ static PyObject *_wrap_wxEvtHandler_AddPendingEvent(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxEvtHandler_ProcessPendingEvents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_ProcessPendingEvents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14748,7 +14814,7 @@ static PyObject *_wrap_wxEvtHandler_ProcessPendingEvents(PyObject *, PyObject *a
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEvtHandler_ProcessPendingEvents",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EvtHandler_ProcessPendingEvents",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -14765,7 +14831,7 @@ static PyObject *_wrap_wxEvtHandler_ProcessPendingEvents(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxEvtHandler_Connect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_Connect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     int arg2 ;
@@ -14781,7 +14847,7 @@ static PyObject *_wrap_wxEvtHandler_Connect(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "id",(char *) "lastId",(char *) "eventType",(char *) "func", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:wxEvtHandler_Connect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:EvtHandler_Connect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -14811,7 +14877,7 @@ static PyObject *_wrap_wxEvtHandler_Connect(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxEvtHandler_Disconnect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_Disconnect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     int arg2 ;
@@ -14826,7 +14892,7 @@ static PyObject *_wrap_wxEvtHandler_Disconnect(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "id",(char *) "lastId",(char *) "eventType", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:wxEvtHandler_Disconnect",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:EvtHandler_Disconnect",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -14861,7 +14927,7 @@ static PyObject *_wrap_wxEvtHandler_Disconnect(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxEvtHandler__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -14873,7 +14939,7 @@ static PyObject *_wrap_wxEvtHandler__setOORInfo(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "_self",(char *) "incref", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxEvtHandler__setOORInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:EvtHandler__setOORInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -14897,21 +14963,21 @@ static PyObject *_wrap_wxEvtHandler__setOORInfo(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject * wxEvtHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * EvtHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxEvtHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxNewEventType(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NewEventType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxNewEventType",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":NewEventType",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxEventType)wxNewEventType();
@@ -14928,7 +14994,7 @@ static PyObject *_wrap_wxNewEventType(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_delete_wxEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Event(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14936,7 +15002,7 @@ static PyObject *_wrap_delete_wxEvent(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Event",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -14953,7 +15019,7 @@ static PyObject *_wrap_delete_wxEvent(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxEvent_SetEventType(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_SetEventType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     wxEventType arg2 ;
@@ -14963,7 +15029,7 @@ static PyObject *_wrap_wxEvent_SetEventType(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "typ", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxEvent_SetEventType",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_SetEventType",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -14984,7 +15050,7 @@ static PyObject *_wrap_wxEvent_SetEventType(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxEvent_GetEventType(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_GetEventType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     wxEventType result;
@@ -14993,7 +15059,7 @@ static PyObject *_wrap_wxEvent_GetEventType(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEvent_GetEventType",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_GetEventType",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15012,7 +15078,7 @@ static PyObject *_wrap_wxEvent_GetEventType(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxEvent_GetEventObject(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_GetEventObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     wxObject *result;
@@ -15021,7 +15087,7 @@ static PyObject *_wrap_wxEvent_GetEventObject(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEvent_GetEventObject",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_GetEventObject",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15040,7 +15106,7 @@ static PyObject *_wrap_wxEvent_GetEventObject(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxEvent_SetEventObject(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_SetEventObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     wxObject *arg2 = (wxObject *) 0 ;
@@ -15050,7 +15116,7 @@ static PyObject *_wrap_wxEvent_SetEventObject(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "obj", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxEvent_SetEventObject",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_SetEventObject",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxObject, SWIG_POINTER_EXCEPTION | 0);
@@ -15069,7 +15135,7 @@ static PyObject *_wrap_wxEvent_SetEventObject(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxEvent_GetTimestamp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_GetTimestamp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     long result;
@@ -15078,7 +15144,7 @@ static PyObject *_wrap_wxEvent_GetTimestamp(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEvent_GetTimestamp",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_GetTimestamp",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15097,7 +15163,7 @@ static PyObject *_wrap_wxEvent_GetTimestamp(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxEvent_SetTimestamp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_SetTimestamp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     long arg2 = (long) 0 ;
@@ -15107,7 +15173,7 @@ static PyObject *_wrap_wxEvent_SetTimestamp(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "ts", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxEvent_SetTimestamp",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Event_SetTimestamp",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -15130,7 +15196,7 @@ static PyObject *_wrap_wxEvent_SetTimestamp(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxEvent_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     int result;
@@ -15139,7 +15205,7 @@ static PyObject *_wrap_wxEvent_GetId(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEvent_GetId",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_GetId",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15158,7 +15224,7 @@ static PyObject *_wrap_wxEvent_GetId(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxEvent_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     int arg2 ;
@@ -15168,7 +15234,7 @@ static PyObject *_wrap_wxEvent_SetId(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "Id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxEvent_SetId",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_SetId",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15189,7 +15255,7 @@ static PyObject *_wrap_wxEvent_SetId(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxEvent_IsCommandEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_IsCommandEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     bool result;
@@ -15198,7 +15264,7 @@ static PyObject *_wrap_wxEvent_IsCommandEvent(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEvent_IsCommandEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_IsCommandEvent",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15217,7 +15283,7 @@ static PyObject *_wrap_wxEvent_IsCommandEvent(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxEvent_Skip(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_Skip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     bool arg2 = (bool) true ;
@@ -15227,7 +15293,7 @@ static PyObject *_wrap_wxEvent_Skip(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self",(char *) "skip", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxEvent_Skip",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Event_Skip",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -15250,7 +15316,7 @@ static PyObject *_wrap_wxEvent_Skip(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxEvent_GetSkipped(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_GetSkipped(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     bool result;
@@ -15259,7 +15325,7 @@ static PyObject *_wrap_wxEvent_GetSkipped(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEvent_GetSkipped",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_GetSkipped",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15278,7 +15344,7 @@ static PyObject *_wrap_wxEvent_GetSkipped(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxEvent_ShouldPropagate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_ShouldPropagate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     bool result;
@@ -15287,7 +15353,7 @@ static PyObject *_wrap_wxEvent_ShouldPropagate(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEvent_ShouldPropagate",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_ShouldPropagate",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15306,7 +15372,7 @@ static PyObject *_wrap_wxEvent_ShouldPropagate(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxEvent_StopPropagation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_StopPropagation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     int result;
@@ -15315,7 +15381,7 @@ static PyObject *_wrap_wxEvent_StopPropagation(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEvent_StopPropagation",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_StopPropagation",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15334,7 +15400,7 @@ static PyObject *_wrap_wxEvent_StopPropagation(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxEvent_ResumePropagation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_ResumePropagation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     int arg2 ;
@@ -15344,7 +15410,7 @@ static PyObject *_wrap_wxEvent_ResumePropagation(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "propagationLevel", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxEvent_ResumePropagation",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_ResumePropagation",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15365,7 +15431,7 @@ static PyObject *_wrap_wxEvent_ResumePropagation(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxEvent_Clone(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_Clone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     wxEvent *result;
@@ -15374,7 +15440,7 @@ static PyObject *_wrap_wxEvent_Clone(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEvent_Clone",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_Clone",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15391,14 +15457,14 @@ static PyObject *_wrap_wxEvent_Clone(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject * wxEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * Event_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxPropagationDisabler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PropagationDisabler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = 0 ;
     wxPropagationDisabler *result;
@@ -15407,7 +15473,7 @@ static PyObject *_wrap_new_wxPropagationDisabler(PyObject *, PyObject *args, PyO
         (char *) "event", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_wxPropagationDisabler",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PropagationDisabler",kwnames,&obj0)) goto fail;
     {
         SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -15430,7 +15496,7 @@ static PyObject *_wrap_new_wxPropagationDisabler(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_delete_wxPropagationDisabler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PropagationDisabler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPropagationDisabler *arg1 = (wxPropagationDisabler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15438,7 +15504,7 @@ static PyObject *_wrap_delete_wxPropagationDisabler(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxPropagationDisabler",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PropagationDisabler",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPropagationDisabler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15455,14 +15521,14 @@ static PyObject *_wrap_delete_wxPropagationDisabler(PyObject *, PyObject *args,
 }
 
 
-static PyObject * wxPropagationDisabler_swigregister(PyObject *, PyObject *args) {
+static PyObject * PropagationDisabler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPropagationDisabler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxPropagateOnce(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PropagateOnce(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = 0 ;
     wxPropagateOnce *result;
@@ -15471,7 +15537,7 @@ static PyObject *_wrap_new_wxPropagateOnce(PyObject *, PyObject *args, PyObject
         (char *) "event", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_wxPropagateOnce",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PropagateOnce",kwnames,&obj0)) goto fail;
     {
         SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvent, SWIG_POINTER_EXCEPTION | 0);
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -15494,7 +15560,7 @@ static PyObject *_wrap_new_wxPropagateOnce(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_delete_wxPropagateOnce(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PropagateOnce(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPropagateOnce *arg1 = (wxPropagateOnce *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15502,7 +15568,7 @@ static PyObject *_wrap_delete_wxPropagateOnce(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxPropagateOnce",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PropagateOnce",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPropagateOnce, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15519,14 +15585,14 @@ static PyObject *_wrap_delete_wxPropagateOnce(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject * wxPropagateOnce_swigregister(PyObject *, PyObject *args) {
+static PyObject * PropagateOnce_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPropagateOnce, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxCommandEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CommandEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -15537,7 +15603,7 @@ static PyObject *_wrap_new_wxCommandEvent(PyObject *, PyObject *args, PyObject *
         (char *) "commandType",(char *) "winid", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxCommandEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_CommandEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (wxEventType)(SWIG_As_int(obj0)); 
@@ -15564,7 +15630,7 @@ static PyObject *_wrap_new_wxCommandEvent(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxCommandEvent_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     int result;
@@ -15573,7 +15639,7 @@ static PyObject *_wrap_wxCommandEvent_GetSelection(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxCommandEvent_GetSelection",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_GetSelection",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCommandEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15592,7 +15658,7 @@ static PyObject *_wrap_wxCommandEvent_GetSelection(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxCommandEvent_SetString(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_SetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     wxString *arg2 = 0 ;
@@ -15603,7 +15669,7 @@ static PyObject *_wrap_wxCommandEvent_SetString(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "s", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxCommandEvent_SetString",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CommandEvent_SetString",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCommandEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15633,7 +15699,7 @@ static PyObject *_wrap_wxCommandEvent_SetString(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxCommandEvent_GetString(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_GetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     wxString result;
@@ -15642,7 +15708,7 @@ static PyObject *_wrap_wxCommandEvent_GetString(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxCommandEvent_GetString",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_GetString",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCommandEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15665,7 +15731,7 @@ static PyObject *_wrap_wxCommandEvent_GetString(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxCommandEvent_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     bool result;
@@ -15674,7 +15740,7 @@ static PyObject *_wrap_wxCommandEvent_IsChecked(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxCommandEvent_IsChecked",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_IsChecked",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCommandEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15693,7 +15759,7 @@ static PyObject *_wrap_wxCommandEvent_IsChecked(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxCommandEvent_IsSelection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_IsSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     bool result;
@@ -15702,7 +15768,7 @@ static PyObject *_wrap_wxCommandEvent_IsSelection(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxCommandEvent_IsSelection",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_IsSelection",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCommandEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15721,7 +15787,7 @@ static PyObject *_wrap_wxCommandEvent_IsSelection(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxCommandEvent_SetExtraLong(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_SetExtraLong(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     long arg2 ;
@@ -15731,7 +15797,7 @@ static PyObject *_wrap_wxCommandEvent_SetExtraLong(PyObject *, PyObject *args, P
         (char *) "self",(char *) "extraLong", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxCommandEvent_SetExtraLong",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CommandEvent_SetExtraLong",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCommandEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15752,7 +15818,7 @@ static PyObject *_wrap_wxCommandEvent_SetExtraLong(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxCommandEvent_GetExtraLong(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_GetExtraLong(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     long result;
@@ -15761,7 +15827,7 @@ static PyObject *_wrap_wxCommandEvent_GetExtraLong(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxCommandEvent_GetExtraLong",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_GetExtraLong",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCommandEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15780,7 +15846,7 @@ static PyObject *_wrap_wxCommandEvent_GetExtraLong(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxCommandEvent_SetInt(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_SetInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     int arg2 ;
@@ -15790,7 +15856,7 @@ static PyObject *_wrap_wxCommandEvent_SetInt(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "i", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxCommandEvent_SetInt",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CommandEvent_SetInt",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCommandEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15811,7 +15877,7 @@ static PyObject *_wrap_wxCommandEvent_SetInt(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxCommandEvent_GetInt(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_GetInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     long result;
@@ -15820,7 +15886,7 @@ static PyObject *_wrap_wxCommandEvent_GetInt(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxCommandEvent_GetInt",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_GetInt",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCommandEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15839,7 +15905,7 @@ static PyObject *_wrap_wxCommandEvent_GetInt(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxCommandEvent_Clone(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_Clone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     wxEvent *result;
@@ -15848,7 +15914,7 @@ static PyObject *_wrap_wxCommandEvent_Clone(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxCommandEvent_Clone",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_Clone",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCommandEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15865,14 +15931,14 @@ static PyObject *_wrap_wxCommandEvent_Clone(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject * wxCommandEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * CommandEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCommandEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxNotifyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_NotifyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -15883,7 +15949,7 @@ static PyObject *_wrap_new_wxNotifyEvent(PyObject *, PyObject *args, PyObject *k
         (char *) "commandType",(char *) "winid", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxNotifyEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_NotifyEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (wxEventType)(SWIG_As_int(obj0)); 
@@ -15910,7 +15976,7 @@ static PyObject *_wrap_new_wxNotifyEvent(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxNotifyEvent_Veto(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NotifyEvent_Veto(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotifyEvent *arg1 = (wxNotifyEvent *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15918,7 +15984,7 @@ static PyObject *_wrap_wxNotifyEvent_Veto(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxNotifyEvent_Veto",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NotifyEvent_Veto",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNotifyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15935,7 +16001,7 @@ static PyObject *_wrap_wxNotifyEvent_Veto(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxNotifyEvent_Allow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NotifyEvent_Allow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotifyEvent *arg1 = (wxNotifyEvent *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15943,7 +16009,7 @@ static PyObject *_wrap_wxNotifyEvent_Allow(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxNotifyEvent_Allow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NotifyEvent_Allow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNotifyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15960,7 +16026,7 @@ static PyObject *_wrap_wxNotifyEvent_Allow(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxNotifyEvent_IsAllowed(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NotifyEvent_IsAllowed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotifyEvent *arg1 = (wxNotifyEvent *) 0 ;
     bool result;
@@ -15969,7 +16035,7 @@ static PyObject *_wrap_wxNotifyEvent_IsAllowed(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxNotifyEvent_IsAllowed",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NotifyEvent_IsAllowed",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNotifyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -15988,14 +16054,14 @@ static PyObject *_wrap_wxNotifyEvent_IsAllowed(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject * wxNotifyEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * NotifyEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxNotifyEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxScrollEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ScrollEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -16010,7 +16076,7 @@ static PyObject *_wrap_new_wxScrollEvent(PyObject *, PyObject *args, PyObject *k
         (char *) "commandType",(char *) "winid",(char *) "pos",(char *) "orient", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_wxScrollEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ScrollEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
         {
             arg1 = (wxEventType)(SWIG_As_int(obj0)); 
@@ -16049,7 +16115,7 @@ static PyObject *_wrap_new_wxScrollEvent(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxScrollEvent_GetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollEvent_GetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollEvent *arg1 = (wxScrollEvent *) 0 ;
     int result;
@@ -16058,7 +16124,7 @@ static PyObject *_wrap_wxScrollEvent_GetOrientation(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxScrollEvent_GetOrientation",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ScrollEvent_GetOrientation",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxScrollEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16077,7 +16143,7 @@ static PyObject *_wrap_wxScrollEvent_GetOrientation(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxScrollEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollEvent *arg1 = (wxScrollEvent *) 0 ;
     int result;
@@ -16086,7 +16152,7 @@ static PyObject *_wrap_wxScrollEvent_GetPosition(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxScrollEvent_GetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ScrollEvent_GetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxScrollEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16105,7 +16171,7 @@ static PyObject *_wrap_wxScrollEvent_GetPosition(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxScrollEvent_SetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollEvent_SetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollEvent *arg1 = (wxScrollEvent *) 0 ;
     int arg2 ;
@@ -16115,7 +16181,7 @@ static PyObject *_wrap_wxScrollEvent_SetOrientation(PyObject *, PyObject *args,
         (char *) "self",(char *) "orient", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxScrollEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxScrollEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16136,7 +16202,7 @@ static PyObject *_wrap_wxScrollEvent_SetOrientation(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxScrollEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollEvent *arg1 = (wxScrollEvent *) 0 ;
     int arg2 ;
@@ -16146,7 +16212,7 @@ static PyObject *_wrap_wxScrollEvent_SetPosition(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "pos", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxScrollEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxScrollEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16167,14 +16233,14 @@ static PyObject *_wrap_wxScrollEvent_SetPosition(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject * wxScrollEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * ScrollEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxScrollEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxScrollWinEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ScrollWinEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -16187,7 +16253,7 @@ static PyObject *_wrap_new_wxScrollWinEvent(PyObject *, PyObject *args, PyObject
         (char *) "commandType",(char *) "pos",(char *) "orient", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_wxScrollWinEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ScrollWinEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
         {
             arg1 = (wxEventType)(SWIG_As_int(obj0)); 
@@ -16220,7 +16286,7 @@ static PyObject *_wrap_new_wxScrollWinEvent(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxScrollWinEvent_GetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollWinEvent_GetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ;
     int result;
@@ -16229,7 +16295,7 @@ static PyObject *_wrap_wxScrollWinEvent_GetOrientation(PyObject *, PyObject *arg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxScrollWinEvent_GetOrientation",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ScrollWinEvent_GetOrientation",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxScrollWinEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16248,7 +16314,7 @@ static PyObject *_wrap_wxScrollWinEvent_GetOrientation(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxScrollWinEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollWinEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ;
     int result;
@@ -16257,7 +16323,7 @@ static PyObject *_wrap_wxScrollWinEvent_GetPosition(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxScrollWinEvent_GetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ScrollWinEvent_GetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxScrollWinEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16276,7 +16342,7 @@ static PyObject *_wrap_wxScrollWinEvent_GetPosition(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxScrollWinEvent_SetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollWinEvent_SetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ;
     int arg2 ;
@@ -16286,7 +16352,7 @@ static PyObject *_wrap_wxScrollWinEvent_SetOrientation(PyObject *, PyObject *arg
         (char *) "self",(char *) "orient", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxScrollWinEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollWinEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxScrollWinEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16307,7 +16373,7 @@ static PyObject *_wrap_wxScrollWinEvent_SetOrientation(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxScrollWinEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollWinEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ;
     int arg2 ;
@@ -16317,7 +16383,7 @@ static PyObject *_wrap_wxScrollWinEvent_SetPosition(PyObject *, PyObject *args,
         (char *) "self",(char *) "pos", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxScrollWinEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollWinEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxScrollWinEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16338,14 +16404,14 @@ static PyObject *_wrap_wxScrollWinEvent_SetPosition(PyObject *, PyObject *args,
 }
 
 
-static PyObject * wxScrollWinEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * ScrollWinEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxScrollWinEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxMouseEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MouseEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     wxMouseEvent *result;
@@ -16354,7 +16420,7 @@ static PyObject *_wrap_new_wxMouseEvent(PyObject *, PyObject *args, PyObject *kw
         (char *) "mouseType", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxMouseEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MouseEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (wxEventType)(SWIG_As_int(obj0)); 
@@ -16377,7 +16443,7 @@ static PyObject *_wrap_new_wxMouseEvent(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxMouseEvent_IsButton(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_IsButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16386,7 +16452,7 @@ static PyObject *_wrap_wxMouseEvent_IsButton(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_IsButton",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_IsButton",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16405,7 +16471,7 @@ static PyObject *_wrap_wxMouseEvent_IsButton(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMouseEvent_ButtonDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_ButtonDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 = (int) wxMOUSE_BTN_ANY ;
@@ -16416,7 +16482,7 @@ static PyObject *_wrap_wxMouseEvent_ButtonDown(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "but", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxMouseEvent_ButtonDown",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MouseEvent_ButtonDown",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -16441,7 +16507,7 @@ static PyObject *_wrap_wxMouseEvent_ButtonDown(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxMouseEvent_ButtonDClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_ButtonDClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 = (int) wxMOUSE_BTN_ANY ;
@@ -16452,7 +16518,7 @@ static PyObject *_wrap_wxMouseEvent_ButtonDClick(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "but", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxMouseEvent_ButtonDClick",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MouseEvent_ButtonDClick",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -16477,7 +16543,7 @@ static PyObject *_wrap_wxMouseEvent_ButtonDClick(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxMouseEvent_ButtonUp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_ButtonUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 = (int) wxMOUSE_BTN_ANY ;
@@ -16488,7 +16554,7 @@ static PyObject *_wrap_wxMouseEvent_ButtonUp(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "but", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxMouseEvent_ButtonUp",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MouseEvent_ButtonUp",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -16513,7 +16579,7 @@ static PyObject *_wrap_wxMouseEvent_ButtonUp(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMouseEvent_Button(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_Button(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -16521,10 +16587,10 @@ static PyObject *_wrap_wxMouseEvent_Button(PyObject *, PyObject *args, PyObject
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "but", NULL 
+        (char *) "self",(char *) "button", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_Button",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_Button",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16547,7 +16613,7 @@ static PyObject *_wrap_wxMouseEvent_Button(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMouseEvent_ButtonIsDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_ButtonIsDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -16558,7 +16624,7 @@ static PyObject *_wrap_wxMouseEvent_ButtonIsDown(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "but", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_ButtonIsDown",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_ButtonIsDown",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16581,7 +16647,7 @@ static PyObject *_wrap_wxMouseEvent_ButtonIsDown(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxMouseEvent_GetButton(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -16590,7 +16656,7 @@ static PyObject *_wrap_wxMouseEvent_GetButton(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_GetButton",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetButton",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16609,7 +16675,7 @@ static PyObject *_wrap_wxMouseEvent_GetButton(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMouseEvent_ControlDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_ControlDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16618,7 +16684,7 @@ static PyObject *_wrap_wxMouseEvent_ControlDown(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_ControlDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_ControlDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16637,7 +16703,7 @@ static PyObject *_wrap_wxMouseEvent_ControlDown(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxMouseEvent_MetaDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_MetaDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16646,7 +16712,7 @@ static PyObject *_wrap_wxMouseEvent_MetaDown(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_MetaDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_MetaDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16665,7 +16731,7 @@ static PyObject *_wrap_wxMouseEvent_MetaDown(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMouseEvent_AltDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_AltDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16674,7 +16740,7 @@ static PyObject *_wrap_wxMouseEvent_AltDown(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_AltDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_AltDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16693,7 +16759,7 @@ static PyObject *_wrap_wxMouseEvent_AltDown(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMouseEvent_ShiftDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_ShiftDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16702,7 +16768,7 @@ static PyObject *_wrap_wxMouseEvent_ShiftDown(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_ShiftDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_ShiftDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16721,7 +16787,7 @@ static PyObject *_wrap_wxMouseEvent_ShiftDown(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMouseEvent_CmdDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_CmdDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16730,7 +16796,7 @@ static PyObject *_wrap_wxMouseEvent_CmdDown(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_CmdDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_CmdDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16749,7 +16815,7 @@ static PyObject *_wrap_wxMouseEvent_CmdDown(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMouseEvent_LeftDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_LeftDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16758,7 +16824,7 @@ static PyObject *_wrap_wxMouseEvent_LeftDown(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_LeftDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_LeftDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16777,7 +16843,7 @@ static PyObject *_wrap_wxMouseEvent_LeftDown(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMouseEvent_MiddleDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_MiddleDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16786,7 +16852,7 @@ static PyObject *_wrap_wxMouseEvent_MiddleDown(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_MiddleDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_MiddleDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16805,7 +16871,7 @@ static PyObject *_wrap_wxMouseEvent_MiddleDown(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxMouseEvent_RightDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_RightDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16814,7 +16880,7 @@ static PyObject *_wrap_wxMouseEvent_RightDown(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_RightDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_RightDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16833,7 +16899,7 @@ static PyObject *_wrap_wxMouseEvent_RightDown(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMouseEvent_LeftUp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_LeftUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16842,7 +16908,7 @@ static PyObject *_wrap_wxMouseEvent_LeftUp(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_LeftUp",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_LeftUp",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16861,7 +16927,7 @@ static PyObject *_wrap_wxMouseEvent_LeftUp(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMouseEvent_MiddleUp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_MiddleUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16870,7 +16936,7 @@ static PyObject *_wrap_wxMouseEvent_MiddleUp(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_MiddleUp",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_MiddleUp",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16889,7 +16955,7 @@ static PyObject *_wrap_wxMouseEvent_MiddleUp(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMouseEvent_RightUp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_RightUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16898,7 +16964,7 @@ static PyObject *_wrap_wxMouseEvent_RightUp(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_RightUp",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_RightUp",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16917,7 +16983,7 @@ static PyObject *_wrap_wxMouseEvent_RightUp(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMouseEvent_LeftDClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_LeftDClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16926,7 +16992,7 @@ static PyObject *_wrap_wxMouseEvent_LeftDClick(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_LeftDClick",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_LeftDClick",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16945,7 +17011,7 @@ static PyObject *_wrap_wxMouseEvent_LeftDClick(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxMouseEvent_MiddleDClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_MiddleDClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16954,7 +17020,7 @@ static PyObject *_wrap_wxMouseEvent_MiddleDClick(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_MiddleDClick",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_MiddleDClick",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -16973,7 +17039,7 @@ static PyObject *_wrap_wxMouseEvent_MiddleDClick(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxMouseEvent_RightDClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_RightDClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -16982,7 +17048,7 @@ static PyObject *_wrap_wxMouseEvent_RightDClick(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_RightDClick",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_RightDClick",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17001,7 +17067,7 @@ static PyObject *_wrap_wxMouseEvent_RightDClick(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxMouseEvent_LeftIsDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_LeftIsDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17010,7 +17076,7 @@ static PyObject *_wrap_wxMouseEvent_LeftIsDown(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_LeftIsDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_LeftIsDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17029,7 +17095,7 @@ static PyObject *_wrap_wxMouseEvent_LeftIsDown(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxMouseEvent_MiddleIsDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_MiddleIsDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17038,7 +17104,7 @@ static PyObject *_wrap_wxMouseEvent_MiddleIsDown(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_MiddleIsDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_MiddleIsDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17057,7 +17123,7 @@ static PyObject *_wrap_wxMouseEvent_MiddleIsDown(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxMouseEvent_RightIsDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_RightIsDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17066,7 +17132,7 @@ static PyObject *_wrap_wxMouseEvent_RightIsDown(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_RightIsDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_RightIsDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17085,7 +17151,7 @@ static PyObject *_wrap_wxMouseEvent_RightIsDown(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxMouseEvent_Dragging(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_Dragging(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17094,7 +17160,7 @@ static PyObject *_wrap_wxMouseEvent_Dragging(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_Dragging",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_Dragging",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17113,7 +17179,7 @@ static PyObject *_wrap_wxMouseEvent_Dragging(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMouseEvent_Moving(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_Moving(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17122,7 +17188,7 @@ static PyObject *_wrap_wxMouseEvent_Moving(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_Moving",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_Moving",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17141,7 +17207,7 @@ static PyObject *_wrap_wxMouseEvent_Moving(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMouseEvent_Entering(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_Entering(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17150,7 +17216,7 @@ static PyObject *_wrap_wxMouseEvent_Entering(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_Entering",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_Entering",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17169,7 +17235,7 @@ static PyObject *_wrap_wxMouseEvent_Entering(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMouseEvent_Leaving(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_Leaving(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17178,7 +17244,7 @@ static PyObject *_wrap_wxMouseEvent_Leaving(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_Leaving",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_Leaving",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17197,7 +17263,7 @@ static PyObject *_wrap_wxMouseEvent_Leaving(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMouseEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     wxPoint result;
@@ -17206,7 +17272,7 @@ static PyObject *_wrap_wxMouseEvent_GetPosition(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_GetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17227,7 +17293,7 @@ static PyObject *_wrap_wxMouseEvent_GetPosition(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxMouseEvent_GetPositionTuple(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetPositionTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     long *arg2 = (long *) 0 ;
@@ -17243,7 +17309,7 @@ static PyObject *_wrap_wxMouseEvent_GetPositionTuple(PyObject *, PyObject *args,
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_GetPositionTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetPositionTuple",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17264,7 +17330,7 @@ static PyObject *_wrap_wxMouseEvent_GetPositionTuple(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxMouseEvent_GetLogicalPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetLogicalPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17275,7 +17341,7 @@ static PyObject *_wrap_wxMouseEvent_GetLogicalPosition(PyObject *, PyObject *arg
         (char *) "self",(char *) "dc", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_GetLogicalPosition",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_GetLogicalPosition",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17304,7 +17370,7 @@ static PyObject *_wrap_wxMouseEvent_GetLogicalPosition(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxMouseEvent_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -17313,7 +17379,7 @@ static PyObject *_wrap_wxMouseEvent_GetX(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_GetX",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetX",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17332,7 +17398,7 @@ static PyObject *_wrap_wxMouseEvent_GetX(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMouseEvent_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -17341,7 +17407,7 @@ static PyObject *_wrap_wxMouseEvent_GetY(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_GetY",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetY",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17360,7 +17426,7 @@ static PyObject *_wrap_wxMouseEvent_GetY(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMouseEvent_GetWheelRotation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetWheelRotation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -17369,7 +17435,7 @@ static PyObject *_wrap_wxMouseEvent_GetWheelRotation(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_GetWheelRotation",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetWheelRotation",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17388,7 +17454,7 @@ static PyObject *_wrap_wxMouseEvent_GetWheelRotation(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxMouseEvent_GetWheelDelta(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetWheelDelta(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -17397,7 +17463,7 @@ static PyObject *_wrap_wxMouseEvent_GetWheelDelta(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_GetWheelDelta",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetWheelDelta",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17416,7 +17482,7 @@ static PyObject *_wrap_wxMouseEvent_GetWheelDelta(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxMouseEvent_GetLinesPerAction(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetLinesPerAction(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -17425,7 +17491,7 @@ static PyObject *_wrap_wxMouseEvent_GetLinesPerAction(PyObject *, PyObject *args
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_GetLinesPerAction",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetLinesPerAction",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17444,7 +17510,7 @@ static PyObject *_wrap_wxMouseEvent_GetLinesPerAction(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxMouseEvent_IsPageScroll(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_IsPageScroll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17453,7 +17519,7 @@ static PyObject *_wrap_wxMouseEvent_IsPageScroll(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_IsPageScroll",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_IsPageScroll",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17472,7 +17538,7 @@ static PyObject *_wrap_wxMouseEvent_IsPageScroll(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -17482,7 +17548,7 @@ static PyObject *_wrap_wxMouseEvent_m_x_set(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "m_x", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_m_x_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_x_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17498,7 +17564,7 @@ static PyObject *_wrap_wxMouseEvent_m_x_set(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -17507,7 +17573,7 @@ static PyObject *_wrap_wxMouseEvent_m_x_get(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_m_x_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_x_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->m_x);
@@ -17521,7 +17587,7 @@ static PyObject *_wrap_wxMouseEvent_m_x_get(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -17531,7 +17597,7 @@ static PyObject *_wrap_wxMouseEvent_m_y_set(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "m_y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_m_y_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_y_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17547,7 +17613,7 @@ static PyObject *_wrap_wxMouseEvent_m_y_set(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -17556,7 +17622,7 @@ static PyObject *_wrap_wxMouseEvent_m_y_get(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_m_y_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_y_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->m_y);
@@ -17570,7 +17636,7 @@ static PyObject *_wrap_wxMouseEvent_m_y_get(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_leftDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_leftDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -17580,7 +17646,7 @@ static PyObject *_wrap_wxMouseEvent_m_leftDown_set(PyObject *, PyObject *args, P
         (char *) "self",(char *) "m_leftDown", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_m_leftDown_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_leftDown_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17596,7 +17662,7 @@ static PyObject *_wrap_wxMouseEvent_m_leftDown_set(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_leftDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_leftDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17605,7 +17671,7 @@ static PyObject *_wrap_wxMouseEvent_m_leftDown_get(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_m_leftDown_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_leftDown_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (bool) ((arg1)->m_leftDown);
@@ -17619,7 +17685,7 @@ static PyObject *_wrap_wxMouseEvent_m_leftDown_get(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_middleDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_middleDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -17629,7 +17695,7 @@ static PyObject *_wrap_wxMouseEvent_m_middleDown_set(PyObject *, PyObject *args,
         (char *) "self",(char *) "m_middleDown", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_m_middleDown_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_middleDown_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17645,7 +17711,7 @@ static PyObject *_wrap_wxMouseEvent_m_middleDown_set(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_middleDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_middleDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17654,7 +17720,7 @@ static PyObject *_wrap_wxMouseEvent_m_middleDown_get(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_m_middleDown_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_middleDown_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (bool) ((arg1)->m_middleDown);
@@ -17668,7 +17734,7 @@ static PyObject *_wrap_wxMouseEvent_m_middleDown_get(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_rightDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_rightDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -17678,7 +17744,7 @@ static PyObject *_wrap_wxMouseEvent_m_rightDown_set(PyObject *, PyObject *args,
         (char *) "self",(char *) "m_rightDown", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_m_rightDown_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_rightDown_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17694,7 +17760,7 @@ static PyObject *_wrap_wxMouseEvent_m_rightDown_set(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_rightDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_rightDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17703,7 +17769,7 @@ static PyObject *_wrap_wxMouseEvent_m_rightDown_get(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_m_rightDown_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_rightDown_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (bool) ((arg1)->m_rightDown);
@@ -17717,7 +17783,7 @@ static PyObject *_wrap_wxMouseEvent_m_rightDown_get(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_controlDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_controlDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -17727,7 +17793,7 @@ static PyObject *_wrap_wxMouseEvent_m_controlDown_set(PyObject *, PyObject *args
         (char *) "self",(char *) "m_controlDown", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_m_controlDown_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_controlDown_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17743,7 +17809,7 @@ static PyObject *_wrap_wxMouseEvent_m_controlDown_set(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_controlDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_controlDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17752,7 +17818,7 @@ static PyObject *_wrap_wxMouseEvent_m_controlDown_get(PyObject *, PyObject *args
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_m_controlDown_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_controlDown_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (bool) ((arg1)->m_controlDown);
@@ -17766,7 +17832,7 @@ static PyObject *_wrap_wxMouseEvent_m_controlDown_get(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_shiftDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_shiftDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -17776,7 +17842,7 @@ static PyObject *_wrap_wxMouseEvent_m_shiftDown_set(PyObject *, PyObject *args,
         (char *) "self",(char *) "m_shiftDown", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_m_shiftDown_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_shiftDown_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17792,7 +17858,7 @@ static PyObject *_wrap_wxMouseEvent_m_shiftDown_set(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_shiftDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_shiftDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17801,7 +17867,7 @@ static PyObject *_wrap_wxMouseEvent_m_shiftDown_get(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_m_shiftDown_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_shiftDown_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (bool) ((arg1)->m_shiftDown);
@@ -17815,7 +17881,7 @@ static PyObject *_wrap_wxMouseEvent_m_shiftDown_get(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_altDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_altDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -17825,7 +17891,7 @@ static PyObject *_wrap_wxMouseEvent_m_altDown_set(PyObject *, PyObject *args, Py
         (char *) "self",(char *) "m_altDown", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_m_altDown_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_altDown_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17841,7 +17907,7 @@ static PyObject *_wrap_wxMouseEvent_m_altDown_set(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_altDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_altDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17850,7 +17916,7 @@ static PyObject *_wrap_wxMouseEvent_m_altDown_get(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_m_altDown_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_altDown_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (bool) ((arg1)->m_altDown);
@@ -17864,7 +17930,7 @@ static PyObject *_wrap_wxMouseEvent_m_altDown_get(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_metaDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_metaDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -17874,7 +17940,7 @@ static PyObject *_wrap_wxMouseEvent_m_metaDown_set(PyObject *, PyObject *args, P
         (char *) "self",(char *) "m_metaDown", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_m_metaDown_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_metaDown_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17890,7 +17956,7 @@ static PyObject *_wrap_wxMouseEvent_m_metaDown_set(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_metaDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_metaDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -17899,7 +17965,7 @@ static PyObject *_wrap_wxMouseEvent_m_metaDown_get(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_m_metaDown_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_metaDown_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (bool) ((arg1)->m_metaDown);
@@ -17913,7 +17979,7 @@ static PyObject *_wrap_wxMouseEvent_m_metaDown_get(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_wheelRotation_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_wheelRotation_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -17923,7 +17989,7 @@ static PyObject *_wrap_wxMouseEvent_m_wheelRotation_set(PyObject *, PyObject *ar
         (char *) "self",(char *) "m_wheelRotation", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_m_wheelRotation_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_wheelRotation_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17939,7 +18005,7 @@ static PyObject *_wrap_wxMouseEvent_m_wheelRotation_set(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_wheelRotation_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_wheelRotation_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -17948,7 +18014,7 @@ static PyObject *_wrap_wxMouseEvent_m_wheelRotation_get(PyObject *, PyObject *ar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_m_wheelRotation_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_wheelRotation_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->m_wheelRotation);
@@ -17962,7 +18028,7 @@ static PyObject *_wrap_wxMouseEvent_m_wheelRotation_get(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_wheelDelta_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_wheelDelta_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -17972,7 +18038,7 @@ static PyObject *_wrap_wxMouseEvent_m_wheelDelta_set(PyObject *, PyObject *args,
         (char *) "self",(char *) "m_wheelDelta", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_m_wheelDelta_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_wheelDelta_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -17988,7 +18054,7 @@ static PyObject *_wrap_wxMouseEvent_m_wheelDelta_set(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_wheelDelta_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_wheelDelta_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -17997,7 +18063,7 @@ static PyObject *_wrap_wxMouseEvent_m_wheelDelta_get(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_m_wheelDelta_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_wheelDelta_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->m_wheelDelta);
@@ -18011,7 +18077,7 @@ static PyObject *_wrap_wxMouseEvent_m_wheelDelta_get(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_linesPerAction_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_linesPerAction_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -18021,7 +18087,7 @@ static PyObject *_wrap_wxMouseEvent_m_linesPerAction_set(PyObject *, PyObject *a
         (char *) "self",(char *) "m_linesPerAction", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMouseEvent_m_linesPerAction_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_linesPerAction_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18037,7 +18103,7 @@ static PyObject *_wrap_wxMouseEvent_m_linesPerAction_set(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxMouseEvent_m_linesPerAction_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_linesPerAction_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -18046,7 +18112,7 @@ static PyObject *_wrap_wxMouseEvent_m_linesPerAction_get(PyObject *, PyObject *a
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseEvent_m_linesPerAction_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_linesPerAction_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->m_linesPerAction);
@@ -18060,14 +18126,14 @@ static PyObject *_wrap_wxMouseEvent_m_linesPerAction_get(PyObject *, PyObject *a
 }
 
 
-static PyObject * wxMouseEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * MouseEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMouseEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxSetCursorEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SetCursorEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -18078,7 +18144,7 @@ static PyObject *_wrap_new_wxSetCursorEvent(PyObject *, PyObject *args, PyObject
         (char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxSetCursorEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SetCursorEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -18105,7 +18171,7 @@ static PyObject *_wrap_new_wxSetCursorEvent(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSetCursorEvent_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SetCursorEvent_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ;
     int result;
@@ -18114,7 +18180,7 @@ static PyObject *_wrap_wxSetCursorEvent_GetX(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSetCursorEvent_GetX",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SetCursorEvent_GetX",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSetCursorEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18133,7 +18199,7 @@ static PyObject *_wrap_wxSetCursorEvent_GetX(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxSetCursorEvent_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SetCursorEvent_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ;
     int result;
@@ -18142,7 +18208,7 @@ static PyObject *_wrap_wxSetCursorEvent_GetY(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSetCursorEvent_GetY",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SetCursorEvent_GetY",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSetCursorEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18161,7 +18227,7 @@ static PyObject *_wrap_wxSetCursorEvent_GetY(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxSetCursorEvent_SetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SetCursorEvent_SetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ;
     wxCursor *arg2 = 0 ;
@@ -18171,7 +18237,7 @@ static PyObject *_wrap_wxSetCursorEvent_SetCursor(PyObject *, PyObject *args, Py
         (char *) "self",(char *) "cursor", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSetCursorEvent_SetCursor",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SetCursorEvent_SetCursor",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSetCursorEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18196,7 +18262,7 @@ static PyObject *_wrap_wxSetCursorEvent_SetCursor(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxSetCursorEvent_GetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SetCursorEvent_GetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ;
     wxCursor *result;
@@ -18205,7 +18271,7 @@ static PyObject *_wrap_wxSetCursorEvent_GetCursor(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSetCursorEvent_GetCursor",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SetCursorEvent_GetCursor",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSetCursorEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18228,7 +18294,7 @@ static PyObject *_wrap_wxSetCursorEvent_GetCursor(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxSetCursorEvent_HasCursor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SetCursorEvent_HasCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ;
     bool result;
@@ -18237,7 +18303,7 @@ static PyObject *_wrap_wxSetCursorEvent_HasCursor(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSetCursorEvent_HasCursor",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SetCursorEvent_HasCursor",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSetCursorEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18256,23 +18322,23 @@ static PyObject *_wrap_wxSetCursorEvent_HasCursor(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject * wxSetCursorEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * SetCursorEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSetCursorEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxKeyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_KeyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     wxKeyEvent *result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
-        (char *) "keyType", NULL 
+        (char *) "eventType", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxKeyEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_KeyEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (wxEventType)(SWIG_As_int(obj0)); 
@@ -18293,7 +18359,7 @@ static PyObject *_wrap_new_wxKeyEvent(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxKeyEvent_ControlDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_ControlDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -18302,7 +18368,7 @@ static PyObject *_wrap_wxKeyEvent_ControlDown(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_ControlDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_ControlDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18321,7 +18387,7 @@ static PyObject *_wrap_wxKeyEvent_ControlDown(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxKeyEvent_MetaDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_MetaDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -18330,7 +18396,7 @@ static PyObject *_wrap_wxKeyEvent_MetaDown(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_MetaDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_MetaDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18349,7 +18415,7 @@ static PyObject *_wrap_wxKeyEvent_MetaDown(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxKeyEvent_AltDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_AltDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -18358,7 +18424,7 @@ static PyObject *_wrap_wxKeyEvent_AltDown(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_AltDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_AltDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18377,7 +18443,7 @@ static PyObject *_wrap_wxKeyEvent_AltDown(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxKeyEvent_ShiftDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_ShiftDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -18386,7 +18452,7 @@ static PyObject *_wrap_wxKeyEvent_ShiftDown(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_ShiftDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_ShiftDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18405,7 +18471,7 @@ static PyObject *_wrap_wxKeyEvent_ShiftDown(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxKeyEvent_CmdDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_CmdDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -18414,7 +18480,7 @@ static PyObject *_wrap_wxKeyEvent_CmdDown(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_CmdDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_CmdDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18433,7 +18499,7 @@ static PyObject *_wrap_wxKeyEvent_CmdDown(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxKeyEvent_HasModifiers(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_HasModifiers(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -18442,7 +18508,7 @@ static PyObject *_wrap_wxKeyEvent_HasModifiers(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_HasModifiers",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_HasModifiers",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18461,7 +18527,7 @@ static PyObject *_wrap_wxKeyEvent_HasModifiers(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxKeyEvent_GetKeyCode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetKeyCode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int result;
@@ -18470,7 +18536,7 @@ static PyObject *_wrap_wxKeyEvent_GetKeyCode(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_GetKeyCode",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetKeyCode",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18489,7 +18555,7 @@ static PyObject *_wrap_wxKeyEvent_GetKeyCode(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxKeyEvent_GetUnicodeKey(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetUnicodeKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int result;
@@ -18498,7 +18564,7 @@ static PyObject *_wrap_wxKeyEvent_GetUnicodeKey(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_GetUnicodeKey",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetUnicodeKey",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18517,7 +18583,7 @@ static PyObject *_wrap_wxKeyEvent_GetUnicodeKey(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxKeyEvent_GetRawKeyCode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     unsigned int result;
@@ -18526,7 +18592,7 @@ static PyObject *_wrap_wxKeyEvent_GetRawKeyCode(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_GetRawKeyCode",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetRawKeyCode",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18545,7 +18611,7 @@ static PyObject *_wrap_wxKeyEvent_GetRawKeyCode(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxKeyEvent_GetRawKeyFlags(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetRawKeyFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     unsigned int result;
@@ -18554,7 +18620,7 @@ static PyObject *_wrap_wxKeyEvent_GetRawKeyFlags(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_GetRawKeyFlags",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetRawKeyFlags",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18573,7 +18639,7 @@ static PyObject *_wrap_wxKeyEvent_GetRawKeyFlags(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxKeyEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     wxPoint result;
@@ -18582,7 +18648,7 @@ static PyObject *_wrap_wxKeyEvent_GetPosition(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_GetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18603,7 +18669,7 @@ static PyObject *_wrap_wxKeyEvent_GetPosition(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxKeyEvent_GetPositionTuple(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetPositionTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     long *arg2 = (long *) 0 ;
@@ -18619,7 +18685,7 @@ static PyObject *_wrap_wxKeyEvent_GetPositionTuple(PyObject *, PyObject *args, P
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_GetPositionTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetPositionTuple",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18640,7 +18706,7 @@ static PyObject *_wrap_wxKeyEvent_GetPositionTuple(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxKeyEvent_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int result;
@@ -18649,7 +18715,7 @@ static PyObject *_wrap_wxKeyEvent_GetX(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_GetX",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetX",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18668,7 +18734,7 @@ static PyObject *_wrap_wxKeyEvent_GetX(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxKeyEvent_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int result;
@@ -18677,7 +18743,7 @@ static PyObject *_wrap_wxKeyEvent_GetY(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_GetY",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetY",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18696,7 +18762,7 @@ static PyObject *_wrap_wxKeyEvent_GetY(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int arg2 ;
@@ -18706,7 +18772,7 @@ static PyObject *_wrap_wxKeyEvent_m_x_set(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "m_x", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxKeyEvent_m_x_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_x_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18722,7 +18788,7 @@ static PyObject *_wrap_wxKeyEvent_m_x_set(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int result;
@@ -18731,7 +18797,7 @@ static PyObject *_wrap_wxKeyEvent_m_x_get(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_m_x_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_x_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->m_x);
@@ -18745,7 +18811,7 @@ static PyObject *_wrap_wxKeyEvent_m_x_get(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int arg2 ;
@@ -18755,7 +18821,7 @@ static PyObject *_wrap_wxKeyEvent_m_y_set(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "m_y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxKeyEvent_m_y_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_y_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18771,7 +18837,7 @@ static PyObject *_wrap_wxKeyEvent_m_y_set(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int result;
@@ -18780,7 +18846,7 @@ static PyObject *_wrap_wxKeyEvent_m_y_get(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_m_y_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_y_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->m_y);
@@ -18794,7 +18860,7 @@ static PyObject *_wrap_wxKeyEvent_m_y_get(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_keyCode_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_keyCode_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     long arg2 ;
@@ -18804,7 +18870,7 @@ static PyObject *_wrap_wxKeyEvent_m_keyCode_set(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "m_keyCode", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxKeyEvent_m_keyCode_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_keyCode_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18820,7 +18886,7 @@ static PyObject *_wrap_wxKeyEvent_m_keyCode_set(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_keyCode_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_keyCode_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     long result;
@@ -18829,7 +18895,7 @@ static PyObject *_wrap_wxKeyEvent_m_keyCode_get(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_m_keyCode_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_keyCode_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (long) ((arg1)->m_keyCode);
@@ -18843,7 +18909,7 @@ static PyObject *_wrap_wxKeyEvent_m_keyCode_get(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_controlDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_controlDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool arg2 ;
@@ -18853,7 +18919,7 @@ static PyObject *_wrap_wxKeyEvent_m_controlDown_set(PyObject *, PyObject *args,
         (char *) "self",(char *) "m_controlDown", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxKeyEvent_m_controlDown_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_controlDown_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18869,7 +18935,7 @@ static PyObject *_wrap_wxKeyEvent_m_controlDown_set(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_controlDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_controlDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -18878,7 +18944,7 @@ static PyObject *_wrap_wxKeyEvent_m_controlDown_get(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_m_controlDown_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_controlDown_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (bool) ((arg1)->m_controlDown);
@@ -18892,7 +18958,7 @@ static PyObject *_wrap_wxKeyEvent_m_controlDown_get(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_shiftDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_shiftDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool arg2 ;
@@ -18902,7 +18968,7 @@ static PyObject *_wrap_wxKeyEvent_m_shiftDown_set(PyObject *, PyObject *args, Py
         (char *) "self",(char *) "m_shiftDown", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxKeyEvent_m_shiftDown_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_shiftDown_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18918,7 +18984,7 @@ static PyObject *_wrap_wxKeyEvent_m_shiftDown_set(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_shiftDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_shiftDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -18927,7 +18993,7 @@ static PyObject *_wrap_wxKeyEvent_m_shiftDown_get(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_m_shiftDown_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_shiftDown_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (bool) ((arg1)->m_shiftDown);
@@ -18941,7 +19007,7 @@ static PyObject *_wrap_wxKeyEvent_m_shiftDown_get(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_altDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_altDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool arg2 ;
@@ -18951,7 +19017,7 @@ static PyObject *_wrap_wxKeyEvent_m_altDown_set(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "m_altDown", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxKeyEvent_m_altDown_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_altDown_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18967,7 +19033,7 @@ static PyObject *_wrap_wxKeyEvent_m_altDown_set(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_altDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_altDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -18976,7 +19042,7 @@ static PyObject *_wrap_wxKeyEvent_m_altDown_get(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_m_altDown_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_altDown_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (bool) ((arg1)->m_altDown);
@@ -18990,7 +19056,7 @@ static PyObject *_wrap_wxKeyEvent_m_altDown_get(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_metaDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_metaDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool arg2 ;
@@ -19000,7 +19066,7 @@ static PyObject *_wrap_wxKeyEvent_m_metaDown_set(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "m_metaDown", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxKeyEvent_m_metaDown_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_metaDown_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19016,7 +19082,7 @@ static PyObject *_wrap_wxKeyEvent_m_metaDown_set(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_metaDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_metaDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -19025,7 +19091,7 @@ static PyObject *_wrap_wxKeyEvent_m_metaDown_get(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_m_metaDown_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_metaDown_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (bool) ((arg1)->m_metaDown);
@@ -19039,7 +19105,7 @@ static PyObject *_wrap_wxKeyEvent_m_metaDown_get(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_scanCode_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_scanCode_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool arg2 ;
@@ -19049,7 +19115,7 @@ static PyObject *_wrap_wxKeyEvent_m_scanCode_set(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "m_scanCode", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxKeyEvent_m_scanCode_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_scanCode_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19065,7 +19131,7 @@ static PyObject *_wrap_wxKeyEvent_m_scanCode_set(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_scanCode_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_scanCode_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -19074,7 +19140,7 @@ static PyObject *_wrap_wxKeyEvent_m_scanCode_get(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_m_scanCode_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_scanCode_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (bool) ((arg1)->m_scanCode);
@@ -19088,7 +19154,7 @@ static PyObject *_wrap_wxKeyEvent_m_scanCode_get(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_rawCode_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     unsigned int arg2 ;
@@ -19098,7 +19164,7 @@ static PyObject *_wrap_wxKeyEvent_m_rawCode_set(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "m_rawCode", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxKeyEvent_m_rawCode_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawCode_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19114,7 +19180,7 @@ static PyObject *_wrap_wxKeyEvent_m_rawCode_set(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_rawCode_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     unsigned int result;
@@ -19123,7 +19189,7 @@ static PyObject *_wrap_wxKeyEvent_m_rawCode_get(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_m_rawCode_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_rawCode_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (unsigned int) ((arg1)->m_rawCode);
@@ -19137,7 +19203,7 @@ static PyObject *_wrap_wxKeyEvent_m_rawCode_get(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_rawFlags_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     unsigned int arg2 ;
@@ -19147,7 +19213,7 @@ static PyObject *_wrap_wxKeyEvent_m_rawFlags_set(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "m_rawFlags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxKeyEvent_m_rawFlags_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawFlags_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19163,7 +19229,7 @@ static PyObject *_wrap_wxKeyEvent_m_rawFlags_set(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxKeyEvent_m_rawFlags_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_rawFlags_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     unsigned int result;
@@ -19172,7 +19238,7 @@ static PyObject *_wrap_wxKeyEvent_m_rawFlags_get(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxKeyEvent_m_rawFlags_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_rawFlags_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (unsigned int) ((arg1)->m_rawFlags);
@@ -19186,14 +19252,14 @@ static PyObject *_wrap_wxKeyEvent_m_rawFlags_get(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject * wxKeyEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * KeyEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxKeyEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxSizeEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SizeEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize const &arg1_defvalue = wxDefaultSize ;
     wxSize *arg1 = (wxSize *) &arg1_defvalue ;
@@ -19206,7 +19272,7 @@ static PyObject *_wrap_new_wxSizeEvent(PyObject *, PyObject *args, PyObject *kwa
         (char *) "sz",(char *) "winid", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxSizeEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SizeEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = &temp1;
@@ -19233,7 +19299,7 @@ static PyObject *_wrap_new_wxSizeEvent(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxSizeEvent_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxSize result;
@@ -19242,7 +19308,7 @@ static PyObject *_wrap_wxSizeEvent_GetSize(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizeEvent_GetSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizeEvent_GetSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizeEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19263,7 +19329,7 @@ static PyObject *_wrap_wxSizeEvent_GetSize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizeEvent_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxRect result;
@@ -19272,7 +19338,7 @@ static PyObject *_wrap_wxSizeEvent_GetRect(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizeEvent_GetRect",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizeEvent_GetRect",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizeEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19293,7 +19359,7 @@ static PyObject *_wrap_wxSizeEvent_GetRect(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizeEvent_SetRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_SetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxRect arg2 ;
@@ -19303,7 +19369,7 @@ static PyObject *_wrap_wxSizeEvent_SetRect(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizeEvent_SetRect",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizeEvent_SetRect",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizeEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19330,7 +19396,7 @@ static PyObject *_wrap_wxSizeEvent_SetRect(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizeEvent_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxSize arg2 ;
@@ -19340,7 +19406,7 @@ static PyObject *_wrap_wxSizeEvent_SetSize(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "size", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizeEvent_SetSize",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizeEvent_SetSize",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizeEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19367,7 +19433,7 @@ static PyObject *_wrap_wxSizeEvent_SetSize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizeEvent_m_size_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_m_size_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxSize *arg2 = (wxSize *) 0 ;
@@ -19377,7 +19443,7 @@ static PyObject *_wrap_wxSizeEvent_m_size_set(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "m_size", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizeEvent_m_size_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizeEvent_m_size_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizeEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION | 0);
@@ -19391,7 +19457,7 @@ static PyObject *_wrap_wxSizeEvent_m_size_set(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxSizeEvent_m_size_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_m_size_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxSize *result;
@@ -19400,7 +19466,7 @@ static PyObject *_wrap_wxSizeEvent_m_size_get(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizeEvent_m_size_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizeEvent_m_size_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizeEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (wxSize *)& ((arg1)->m_size);
@@ -19412,7 +19478,7 @@ static PyObject *_wrap_wxSizeEvent_m_size_get(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxSizeEvent_m_rect_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_m_rect_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxRect *arg2 = (wxRect *) 0 ;
@@ -19422,7 +19488,7 @@ static PyObject *_wrap_wxSizeEvent_m_rect_set(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "m_rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizeEvent_m_rect_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizeEvent_m_rect_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizeEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
@@ -19436,7 +19502,7 @@ static PyObject *_wrap_wxSizeEvent_m_rect_set(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxSizeEvent_m_rect_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_m_rect_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxRect *result;
@@ -19445,7 +19511,7 @@ static PyObject *_wrap_wxSizeEvent_m_rect_get(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizeEvent_m_rect_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizeEvent_m_rect_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizeEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (wxRect *)& ((arg1)->m_rect);
@@ -19457,14 +19523,14 @@ static PyObject *_wrap_wxSizeEvent_m_rect_get(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject * wxSizeEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * SizeEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSizeEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxMoveEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MoveEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint const &arg1_defvalue = wxDefaultPosition ;
     wxPoint *arg1 = (wxPoint *) &arg1_defvalue ;
@@ -19477,7 +19543,7 @@ static PyObject *_wrap_new_wxMoveEvent(PyObject *, PyObject *args, PyObject *kwa
         (char *) "pos",(char *) "winid", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxMoveEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_MoveEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = &temp1;
@@ -19504,7 +19570,7 @@ static PyObject *_wrap_new_wxMoveEvent(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxMoveEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MoveEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
     wxPoint result;
@@ -19513,7 +19579,7 @@ static PyObject *_wrap_wxMoveEvent_GetPosition(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMoveEvent_GetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MoveEvent_GetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19534,7 +19600,7 @@ static PyObject *_wrap_wxMoveEvent_GetPosition(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxMoveEvent_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MoveEvent_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
     wxRect result;
@@ -19543,7 +19609,7 @@ static PyObject *_wrap_wxMoveEvent_GetRect(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMoveEvent_GetRect",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MoveEvent_GetRect",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19564,7 +19630,7 @@ static PyObject *_wrap_wxMoveEvent_GetRect(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMoveEvent_SetRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MoveEvent_SetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
     wxRect *arg2 = 0 ;
@@ -19575,7 +19641,7 @@ static PyObject *_wrap_wxMoveEvent_SetRect(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMoveEvent_SetRect",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MoveEvent_SetRect",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19596,7 +19662,7 @@ static PyObject *_wrap_wxMoveEvent_SetRect(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMoveEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MoveEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -19607,7 +19673,7 @@ static PyObject *_wrap_wxMoveEvent_SetPosition(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "pos", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMoveEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MoveEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19628,14 +19694,14 @@ static PyObject *_wrap_wxMoveEvent_SetPosition(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject * wxMoveEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * MoveEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMoveEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxPaintEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PaintEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxPaintEvent *result;
@@ -19644,7 +19710,7 @@ static PyObject *_wrap_new_wxPaintEvent(PyObject *, PyObject *args, PyObject *kw
         (char *) "Id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxPaintEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PaintEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -19665,14 +19731,14 @@ static PyObject *_wrap_new_wxPaintEvent(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxPaintEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * PaintEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPaintEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxNcPaintEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_NcPaintEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxNcPaintEvent *result;
@@ -19681,7 +19747,7 @@ static PyObject *_wrap_new_wxNcPaintEvent(PyObject *, PyObject *args, PyObject *
         (char *) "winid", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxNcPaintEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_NcPaintEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -19702,17 +19768,17 @@ static PyObject *_wrap_new_wxNcPaintEvent(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject * wxNcPaintEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * NcPaintEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxNcPaintEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxEraseEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_EraseEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
-    wxDC *arg2 = (wxDC *) (wxDC *) NULL ;
+    wxDC *arg2 = (wxDC *) NULL ;
     wxEraseEvent *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -19720,7 +19786,7 @@ static PyObject *_wrap_new_wxEraseEvent(PyObject *, PyObject *args, PyObject *kw
         (char *) "Id",(char *) "dc", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxEraseEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_EraseEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -19745,7 +19811,7 @@ static PyObject *_wrap_new_wxEraseEvent(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxEraseEvent_GetDC(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EraseEvent_GetDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEraseEvent *arg1 = (wxEraseEvent *) 0 ;
     wxDC *result;
@@ -19754,7 +19820,7 @@ static PyObject *_wrap_wxEraseEvent_GetDC(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEraseEvent_GetDC",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EraseEvent_GetDC",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEraseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19773,14 +19839,14 @@ static PyObject *_wrap_wxEraseEvent_GetDC(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject * wxEraseEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * EraseEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxEraseEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxFocusEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FocusEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -19791,7 +19857,7 @@ static PyObject *_wrap_new_wxFocusEvent(PyObject *, PyObject *args, PyObject *kw
         (char *) "type",(char *) "winid", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxFocusEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FocusEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (wxEventType)(SWIG_As_int(obj0)); 
@@ -19818,7 +19884,7 @@ static PyObject *_wrap_new_wxFocusEvent(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxFocusEvent_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FocusEvent_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFocusEvent *arg1 = (wxFocusEvent *) 0 ;
     wxWindow *result;
@@ -19827,7 +19893,7 @@ static PyObject *_wrap_wxFocusEvent_GetWindow(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFocusEvent_GetWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FocusEvent_GetWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFocusEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19846,7 +19912,7 @@ static PyObject *_wrap_wxFocusEvent_GetWindow(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxFocusEvent_SetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FocusEvent_SetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFocusEvent *arg1 = (wxFocusEvent *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -19856,7 +19922,7 @@ static PyObject *_wrap_wxFocusEvent_SetWindow(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxFocusEvent_SetWindow",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FocusEvent_SetWindow",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFocusEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -19875,14 +19941,14 @@ static PyObject *_wrap_wxFocusEvent_SetWindow(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject * wxFocusEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * FocusEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFocusEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxChildFocusEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ChildFocusEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
     wxChildFocusEvent *result;
@@ -19891,7 +19957,7 @@ static PyObject *_wrap_new_wxChildFocusEvent(PyObject *, PyObject *args, PyObjec
         (char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxChildFocusEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_ChildFocusEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
         SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -19910,7 +19976,7 @@ static PyObject *_wrap_new_wxChildFocusEvent(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxChildFocusEvent_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ChildFocusEvent_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxChildFocusEvent *arg1 = (wxChildFocusEvent *) 0 ;
     wxWindow *result;
@@ -19919,7 +19985,7 @@ static PyObject *_wrap_wxChildFocusEvent_GetWindow(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxChildFocusEvent_GetWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ChildFocusEvent_GetWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChildFocusEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19938,14 +20004,14 @@ static PyObject *_wrap_wxChildFocusEvent_GetWindow(PyObject *, PyObject *args, P
 }
 
 
-static PyObject * wxChildFocusEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * ChildFocusEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxChildFocusEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxActivateEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ActivateEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     bool arg2 = (bool) true ;
@@ -19958,7 +20024,7 @@ static PyObject *_wrap_new_wxActivateEvent(PyObject *, PyObject *args, PyObject
         (char *) "type",(char *) "active",(char *) "Id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_wxActivateEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ActivateEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
         {
             arg1 = (wxEventType)(SWIG_As_int(obj0)); 
@@ -19991,7 +20057,7 @@ static PyObject *_wrap_new_wxActivateEvent(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxActivateEvent_GetActive(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ActivateEvent_GetActive(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxActivateEvent *arg1 = (wxActivateEvent *) 0 ;
     bool result;
@@ -20000,7 +20066,7 @@ static PyObject *_wrap_wxActivateEvent_GetActive(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxActivateEvent_GetActive",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ActivateEvent_GetActive",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxActivateEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20019,14 +20085,14 @@ static PyObject *_wrap_wxActivateEvent_GetActive(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject * wxActivateEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * ActivateEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxActivateEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxInitDialogEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_InitDialogEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxInitDialogEvent *result;
@@ -20035,7 +20101,7 @@ static PyObject *_wrap_new_wxInitDialogEvent(PyObject *, PyObject *args, PyObjec
         (char *) "Id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxInitDialogEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_InitDialogEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -20056,14 +20122,14 @@ static PyObject *_wrap_new_wxInitDialogEvent(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject * wxInitDialogEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * InitDialogEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxInitDialogEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxMenuEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MenuEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -20076,7 +20142,7 @@ static PyObject *_wrap_new_wxMenuEvent(PyObject *, PyObject *args, PyObject *kwa
         (char *) "type",(char *) "winid",(char *) "menu", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_wxMenuEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_MenuEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
         {
             arg1 = (wxEventType)(SWIG_As_int(obj0)); 
@@ -20107,7 +20173,7 @@ static PyObject *_wrap_new_wxMenuEvent(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxMenuEvent_GetMenuId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuEvent_GetMenuId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuEvent *arg1 = (wxMenuEvent *) 0 ;
     int result;
@@ -20116,7 +20182,7 @@ static PyObject *_wrap_wxMenuEvent_GetMenuId(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuEvent_GetMenuId",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuEvent_GetMenuId",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20135,7 +20201,7 @@ static PyObject *_wrap_wxMenuEvent_GetMenuId(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMenuEvent_IsPopup(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuEvent_IsPopup(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuEvent *arg1 = (wxMenuEvent *) 0 ;
     bool result;
@@ -20144,7 +20210,7 @@ static PyObject *_wrap_wxMenuEvent_IsPopup(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuEvent_IsPopup",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuEvent_IsPopup",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20163,7 +20229,7 @@ static PyObject *_wrap_wxMenuEvent_IsPopup(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenuEvent_GetMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuEvent_GetMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuEvent *arg1 = (wxMenuEvent *) 0 ;
     wxMenu *result;
@@ -20172,7 +20238,7 @@ static PyObject *_wrap_wxMenuEvent_GetMenu(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuEvent_GetMenu",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuEvent_GetMenu",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20191,14 +20257,14 @@ static PyObject *_wrap_wxMenuEvent_GetMenu(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject * wxMenuEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * MenuEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMenuEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxCloseEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CloseEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -20209,7 +20275,7 @@ static PyObject *_wrap_new_wxCloseEvent(PyObject *, PyObject *args, PyObject *kw
         (char *) "type",(char *) "winid", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxCloseEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_CloseEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (wxEventType)(SWIG_As_int(obj0)); 
@@ -20236,7 +20302,7 @@ static PyObject *_wrap_new_wxCloseEvent(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxCloseEvent_SetLoggingOff(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CloseEvent_SetLoggingOff(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCloseEvent *arg1 = (wxCloseEvent *) 0 ;
     bool arg2 ;
@@ -20246,7 +20312,7 @@ static PyObject *_wrap_wxCloseEvent_SetLoggingOff(PyObject *, PyObject *args, Py
         (char *) "self",(char *) "logOff", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxCloseEvent_SetLoggingOff",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetLoggingOff",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCloseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20267,7 +20333,7 @@ static PyObject *_wrap_wxCloseEvent_SetLoggingOff(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxCloseEvent_GetLoggingOff(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CloseEvent_GetLoggingOff(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCloseEvent *arg1 = (wxCloseEvent *) 0 ;
     bool result;
@@ -20276,7 +20342,7 @@ static PyObject *_wrap_wxCloseEvent_GetLoggingOff(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxCloseEvent_GetLoggingOff",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_GetLoggingOff",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCloseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20295,7 +20361,7 @@ static PyObject *_wrap_wxCloseEvent_GetLoggingOff(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxCloseEvent_Veto(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CloseEvent_Veto(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCloseEvent *arg1 = (wxCloseEvent *) 0 ;
     bool arg2 = (bool) true ;
@@ -20305,7 +20371,7 @@ static PyObject *_wrap_wxCloseEvent_Veto(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "veto", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxCloseEvent_Veto",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:CloseEvent_Veto",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCloseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -20328,66 +20394,66 @@ static PyObject *_wrap_wxCloseEvent_Veto(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxCloseEvent_SetCanVeto(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CloseEvent_GetVeto(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCloseEvent *arg1 = (wxCloseEvent *) 0 ;
-    bool arg2 ;
+    bool result;
     PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "canVeto", NULL 
+        (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxCloseEvent_SetCanVeto",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_GetVeto",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCloseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
-    {
-        arg2 = (bool)(SWIG_As_bool(obj1)); 
-        if (SWIG_arg_fail(2)) SWIG_fail;
-    }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->SetCanVeto(arg2);
+        result = (bool)((wxCloseEvent const *)arg1)->GetVeto();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_wxCloseEvent_CanVeto(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CloseEvent_SetCanVeto(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCloseEvent *arg1 = (wxCloseEvent *) 0 ;
-    bool result;
+    bool arg2 ;
     PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "self", NULL 
+        (char *) "self",(char *) "canVeto", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxCloseEvent_CanVeto",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetCanVeto",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCloseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxCloseEvent const *)arg1)->CanVeto();
+        (arg1)->SetCanVeto(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    {
-        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-    }
+    Py_INCREF(Py_None); resultobj = Py_None;
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_wxCloseEvent_GetVeto(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CloseEvent_CanVeto(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCloseEvent *arg1 = (wxCloseEvent *) 0 ;
     bool result;
@@ -20396,12 +20462,12 @@ static PyObject *_wrap_wxCloseEvent_GetVeto(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxCloseEvent_GetVeto",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_CanVeto",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCloseEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxCloseEvent const *)arg1)->GetVeto();
+        result = (bool)((wxCloseEvent const *)arg1)->CanVeto();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20415,14 +20481,14 @@ static PyObject *_wrap_wxCloseEvent_GetVeto(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject * wxCloseEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * CloseEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCloseEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxShowEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ShowEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     bool arg2 = (bool) false ;
@@ -20433,7 +20499,7 @@ static PyObject *_wrap_new_wxShowEvent(PyObject *, PyObject *args, PyObject *kwa
         (char *) "winid",(char *) "show", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxShowEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_ShowEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -20460,7 +20526,7 @@ static PyObject *_wrap_new_wxShowEvent(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxShowEvent_SetShow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShowEvent_SetShow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShowEvent *arg1 = (wxShowEvent *) 0 ;
     bool arg2 ;
@@ -20470,7 +20536,7 @@ static PyObject *_wrap_wxShowEvent_SetShow(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "show", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxShowEvent_SetShow",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShowEvent_SetShow",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShowEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20491,7 +20557,7 @@ static PyObject *_wrap_wxShowEvent_SetShow(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxShowEvent_GetShow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShowEvent_GetShow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShowEvent *arg1 = (wxShowEvent *) 0 ;
     bool result;
@@ -20500,7 +20566,7 @@ static PyObject *_wrap_wxShowEvent_GetShow(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxShowEvent_GetShow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShowEvent_GetShow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxShowEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20519,14 +20585,14 @@ static PyObject *_wrap_wxShowEvent_GetShow(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject * wxShowEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * ShowEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxShowEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxIconizeEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_IconizeEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     bool arg2 = (bool) true ;
@@ -20537,7 +20603,7 @@ static PyObject *_wrap_new_wxIconizeEvent(PyObject *, PyObject *args, PyObject *
         (char *) "id",(char *) "iconized", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxIconizeEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_IconizeEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -20564,7 +20630,7 @@ static PyObject *_wrap_new_wxIconizeEvent(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxIconizeEvent_Iconized(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IconizeEvent_Iconized(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconizeEvent *arg1 = (wxIconizeEvent *) 0 ;
     bool result;
@@ -20573,7 +20639,7 @@ static PyObject *_wrap_wxIconizeEvent_Iconized(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIconizeEvent_Iconized",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IconizeEvent_Iconized",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIconizeEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20592,14 +20658,14 @@ static PyObject *_wrap_wxIconizeEvent_Iconized(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject * wxIconizeEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * IconizeEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxIconizeEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxMaximizeEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MaximizeEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxMaximizeEvent *result;
@@ -20608,7 +20674,7 @@ static PyObject *_wrap_new_wxMaximizeEvent(PyObject *, PyObject *args, PyObject
         (char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxMaximizeEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MaximizeEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -20629,14 +20695,14 @@ static PyObject *_wrap_new_wxMaximizeEvent(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject * wxMaximizeEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * MaximizeEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMaximizeEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxDropFilesEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropFilesEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDropFilesEvent *arg1 = (wxDropFilesEvent *) 0 ;
     wxPoint result;
@@ -20645,7 +20711,7 @@ static PyObject *_wrap_wxDropFilesEvent_GetPosition(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxDropFilesEvent_GetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DropFilesEvent_GetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDropFilesEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20666,7 +20732,7 @@ static PyObject *_wrap_wxDropFilesEvent_GetPosition(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxDropFilesEvent_GetNumberOfFiles(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropFilesEvent_GetNumberOfFiles(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDropFilesEvent *arg1 = (wxDropFilesEvent *) 0 ;
     int result;
@@ -20675,7 +20741,7 @@ static PyObject *_wrap_wxDropFilesEvent_GetNumberOfFiles(PyObject *, PyObject *a
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxDropFilesEvent_GetNumberOfFiles",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DropFilesEvent_GetNumberOfFiles",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDropFilesEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20694,7 +20760,7 @@ static PyObject *_wrap_wxDropFilesEvent_GetNumberOfFiles(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxDropFilesEvent_GetFiles(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropFilesEvent_GetFiles(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDropFilesEvent *arg1 = (wxDropFilesEvent *) 0 ;
     PyObject *result;
@@ -20703,7 +20769,7 @@ static PyObject *_wrap_wxDropFilesEvent_GetFiles(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxDropFilesEvent_GetFiles",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DropFilesEvent_GetFiles",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDropFilesEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20720,14 +20786,14 @@ static PyObject *_wrap_wxDropFilesEvent_GetFiles(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject * wxDropFilesEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * DropFilesEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDropFilesEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxUpdateUIEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_UpdateUIEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxUpdateUIEvent *result;
@@ -20736,7 +20802,7 @@ static PyObject *_wrap_new_wxUpdateUIEvent(PyObject *, PyObject *args, PyObject
         (char *) "commandId", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxUpdateUIEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_UpdateUIEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -20757,7 +20823,7 @@ static PyObject *_wrap_new_wxUpdateUIEvent(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_GetChecked(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool result;
@@ -20766,7 +20832,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetChecked(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxUpdateUIEvent_GetChecked",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_GetChecked",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxUpdateUIEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20785,7 +20851,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetChecked(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_GetEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool result;
@@ -20794,7 +20860,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetEnabled(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxUpdateUIEvent_GetEnabled",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_GetEnabled",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxUpdateUIEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20813,7 +20879,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetEnabled(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     wxString result;
@@ -20822,7 +20888,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetText(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxUpdateUIEvent_GetText",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_GetText",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxUpdateUIEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20845,7 +20911,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetText(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_GetSetText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetSetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool result;
@@ -20854,7 +20920,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetSetText(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxUpdateUIEvent_GetSetText",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_GetSetText",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxUpdateUIEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20873,7 +20939,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetSetText(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_GetSetChecked(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetSetChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool result;
@@ -20882,7 +20948,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetSetChecked(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxUpdateUIEvent_GetSetChecked",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_GetSetChecked",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxUpdateUIEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20901,7 +20967,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetSetChecked(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_GetSetEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetSetEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool result;
@@ -20910,7 +20976,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetSetEnabled(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxUpdateUIEvent_GetSetEnabled",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_GetSetEnabled",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxUpdateUIEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20929,7 +20995,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetSetEnabled(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_Check(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_Check(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool arg2 ;
@@ -20939,7 +21005,7 @@ static PyObject *_wrap_wxUpdateUIEvent_Check(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "check", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxUpdateUIEvent_Check",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:UpdateUIEvent_Check",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxUpdateUIEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20960,7 +21026,7 @@ static PyObject *_wrap_wxUpdateUIEvent_Check(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool arg2 ;
@@ -20970,7 +21036,7 @@ static PyObject *_wrap_wxUpdateUIEvent_Enable(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "enable", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxUpdateUIEvent_Enable",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:UpdateUIEvent_Enable",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxUpdateUIEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20991,7 +21057,7 @@ static PyObject *_wrap_wxUpdateUIEvent_Enable(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     wxString *arg2 = 0 ;
@@ -21002,7 +21068,7 @@ static PyObject *_wrap_wxUpdateUIEvent_SetText(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "text", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxUpdateUIEvent_SetText",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:UpdateUIEvent_SetText",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxUpdateUIEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21032,7 +21098,7 @@ static PyObject *_wrap_wxUpdateUIEvent_SetText(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_SetUpdateInterval(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_SetUpdateInterval(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     PyObject * obj0 = 0 ;
@@ -21040,7 +21106,7 @@ static PyObject *_wrap_wxUpdateUIEvent_SetUpdateInterval(PyObject *, PyObject *a
         (char *) "updateInterval", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxUpdateUIEvent_SetUpdateInterval",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_SetUpdateInterval",kwnames,&obj0)) goto fail;
     {
         arg1 = (long)(SWIG_As_long(obj0)); 
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -21059,14 +21125,14 @@ static PyObject *_wrap_wxUpdateUIEvent_SetUpdateInterval(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_GetUpdateInterval(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetUpdateInterval(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxUpdateUIEvent_GetUpdateInterval",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":UpdateUIEvent_GetUpdateInterval",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (long)wxUpdateUIEvent::GetUpdateInterval();
@@ -21083,7 +21149,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetUpdateInterval(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_CanUpdate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_CanUpdate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -21092,7 +21158,7 @@ static PyObject *_wrap_wxUpdateUIEvent_CanUpdate(PyObject *, PyObject *args, PyO
         (char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxUpdateUIEvent_CanUpdate",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_CanUpdate",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21111,13 +21177,13 @@ static PyObject *_wrap_wxUpdateUIEvent_CanUpdate(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_ResetUpdateTime(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_ResetUpdateTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxUpdateUIEvent_ResetUpdateTime",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":UpdateUIEvent_ResetUpdateTime",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxUpdateUIEvent::ResetUpdateTime();
@@ -21132,7 +21198,7 @@ static PyObject *_wrap_wxUpdateUIEvent_ResetUpdateTime(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_SetMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_SetMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIMode arg1 ;
     PyObject * obj0 = 0 ;
@@ -21140,7 +21206,7 @@ static PyObject *_wrap_wxUpdateUIEvent_SetMode(PyObject *, PyObject *args, PyObj
         (char *) "mode", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxUpdateUIEvent_SetMode",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_SetMode",kwnames,&obj0)) goto fail;
     {
         arg1 = (wxUpdateUIMode)(SWIG_As_int(obj0)); 
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -21159,14 +21225,14 @@ static PyObject *_wrap_wxUpdateUIEvent_SetMode(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxUpdateUIEvent_GetMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIMode result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxUpdateUIEvent_GetMode",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":UpdateUIEvent_GetMode",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxUpdateUIMode)wxUpdateUIEvent::GetMode();
@@ -21181,21 +21247,21 @@ static PyObject *_wrap_wxUpdateUIEvent_GetMode(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject * wxUpdateUIEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * UpdateUIEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxUpdateUIEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxSysColourChangedEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SysColourChangedEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSysColourChangedEvent *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxSysColourChangedEvent",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_SysColourChangedEvent",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxSysColourChangedEvent *)new wxSysColourChangedEvent();
@@ -21210,14 +21276,14 @@ static PyObject *_wrap_new_wxSysColourChangedEvent(PyObject *, PyObject *args, P
 }
 
 
-static PyObject * wxSysColourChangedEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * SysColourChangedEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSysColourChangedEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxMouseCaptureChangedEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MouseCaptureChangedEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxWindow *arg2 = (wxWindow *) NULL ;
@@ -21228,7 +21294,7 @@ static PyObject *_wrap_new_wxMouseCaptureChangedEvent(PyObject *, PyObject *args
         (char *) "winid",(char *) "gainedCapture", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxMouseCaptureChangedEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_MouseCaptureChangedEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -21253,7 +21319,7 @@ static PyObject *_wrap_new_wxMouseCaptureChangedEvent(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxMouseCaptureChangedEvent_GetCapturedWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseCaptureChangedEvent_GetCapturedWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseCaptureChangedEvent *arg1 = (wxMouseCaptureChangedEvent *) 0 ;
     wxWindow *result;
@@ -21262,7 +21328,7 @@ static PyObject *_wrap_wxMouseCaptureChangedEvent_GetCapturedWindow(PyObject *,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMouseCaptureChangedEvent_GetCapturedWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseCaptureChangedEvent_GetCapturedWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMouseCaptureChangedEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21281,21 +21347,21 @@ static PyObject *_wrap_wxMouseCaptureChangedEvent_GetCapturedWindow(PyObject *,
 }
 
 
-static PyObject * wxMouseCaptureChangedEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * MouseCaptureChangedEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMouseCaptureChangedEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxDisplayChangedEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DisplayChangedEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDisplayChangedEvent *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxDisplayChangedEvent",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_DisplayChangedEvent",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxDisplayChangedEvent *)new wxDisplayChangedEvent();
@@ -21310,14 +21376,14 @@ static PyObject *_wrap_new_wxDisplayChangedEvent(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject * wxDisplayChangedEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * DisplayChangedEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDisplayChangedEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxPaletteChangedEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PaletteChangedEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxPaletteChangedEvent *result;
@@ -21326,7 +21392,7 @@ static PyObject *_wrap_new_wxPaletteChangedEvent(PyObject *, PyObject *args, PyO
         (char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxPaletteChangedEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PaletteChangedEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -21347,7 +21413,7 @@ static PyObject *_wrap_new_wxPaletteChangedEvent(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxPaletteChangedEvent_SetChangedWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PaletteChangedEvent_SetChangedWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPaletteChangedEvent *arg1 = (wxPaletteChangedEvent *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -21357,7 +21423,7 @@ static PyObject *_wrap_wxPaletteChangedEvent_SetChangedWindow(PyObject *, PyObje
         (char *) "self",(char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPaletteChangedEvent_SetChangedWindow",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PaletteChangedEvent_SetChangedWindow",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPaletteChangedEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -21376,7 +21442,7 @@ static PyObject *_wrap_wxPaletteChangedEvent_SetChangedWindow(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxPaletteChangedEvent_GetChangedWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PaletteChangedEvent_GetChangedWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPaletteChangedEvent *arg1 = (wxPaletteChangedEvent *) 0 ;
     wxWindow *result;
@@ -21385,7 +21451,7 @@ static PyObject *_wrap_wxPaletteChangedEvent_GetChangedWindow(PyObject *, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPaletteChangedEvent_GetChangedWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PaletteChangedEvent_GetChangedWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPaletteChangedEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21404,14 +21470,14 @@ static PyObject *_wrap_wxPaletteChangedEvent_GetChangedWindow(PyObject *, PyObje
 }
 
 
-static PyObject * wxPaletteChangedEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * PaletteChangedEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPaletteChangedEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxQueryNewPaletteEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_QueryNewPaletteEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxQueryNewPaletteEvent *result;
@@ -21420,7 +21486,7 @@ static PyObject *_wrap_new_wxQueryNewPaletteEvent(PyObject *, PyObject *args, Py
         (char *) "winid", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxQueryNewPaletteEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_QueryNewPaletteEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -21441,7 +21507,7 @@ static PyObject *_wrap_new_wxQueryNewPaletteEvent(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxQueryNewPaletteEvent_SetPaletteRealized(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryNewPaletteEvent_SetPaletteRealized(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryNewPaletteEvent *arg1 = (wxQueryNewPaletteEvent *) 0 ;
     bool arg2 ;
@@ -21451,7 +21517,7 @@ static PyObject *_wrap_wxQueryNewPaletteEvent_SetPaletteRealized(PyObject *, PyO
         (char *) "self",(char *) "realized", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxQueryNewPaletteEvent_SetPaletteRealized",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryNewPaletteEvent_SetPaletteRealized",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxQueryNewPaletteEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21472,7 +21538,7 @@ static PyObject *_wrap_wxQueryNewPaletteEvent_SetPaletteRealized(PyObject *, PyO
 }
 
 
-static PyObject *_wrap_wxQueryNewPaletteEvent_GetPaletteRealized(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryNewPaletteEvent_GetPaletteRealized(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryNewPaletteEvent *arg1 = (wxQueryNewPaletteEvent *) 0 ;
     bool result;
@@ -21481,7 +21547,7 @@ static PyObject *_wrap_wxQueryNewPaletteEvent_GetPaletteRealized(PyObject *, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxQueryNewPaletteEvent_GetPaletteRealized",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:QueryNewPaletteEvent_GetPaletteRealized",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxQueryNewPaletteEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21500,21 +21566,21 @@ static PyObject *_wrap_wxQueryNewPaletteEvent_GetPaletteRealized(PyObject *, PyO
 }
 
 
-static PyObject * wxQueryNewPaletteEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * QueryNewPaletteEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxQueryNewPaletteEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxNavigationKeyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_NavigationKeyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxNavigationKeyEvent",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_NavigationKeyEvent",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxNavigationKeyEvent *)new wxNavigationKeyEvent();
@@ -21529,7 +21595,7 @@ static PyObject *_wrap_new_wxNavigationKeyEvent(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxNavigationKeyEvent_GetDirection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_GetDirection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     bool result;
@@ -21538,7 +21604,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_GetDirection(PyObject *, PyObject *a
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxNavigationKeyEvent_GetDirection",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NavigationKeyEvent_GetDirection",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNavigationKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21557,7 +21623,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_GetDirection(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxNavigationKeyEvent_SetDirection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_SetDirection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     bool arg2 ;
@@ -21567,7 +21633,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_SetDirection(PyObject *, PyObject *a
         (char *) "self",(char *) "forward", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxNavigationKeyEvent_SetDirection",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetDirection",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNavigationKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21588,7 +21654,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_SetDirection(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxNavigationKeyEvent_IsWindowChange(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_IsWindowChange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     bool result;
@@ -21597,7 +21663,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_IsWindowChange(PyObject *, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxNavigationKeyEvent_IsWindowChange",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NavigationKeyEvent_IsWindowChange",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNavigationKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21616,7 +21682,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_IsWindowChange(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxNavigationKeyEvent_SetWindowChange(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     bool arg2 ;
@@ -21626,7 +21692,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_SetWindowChange(PyObject *, PyObject
         (char *) "self",(char *) "ischange", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxNavigationKeyEvent_SetWindowChange",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetWindowChange",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNavigationKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21647,7 +21713,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_SetWindowChange(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxNavigationKeyEvent_IsFromTab(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_IsFromTab(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     bool result;
@@ -21656,7 +21722,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_IsFromTab(PyObject *, PyObject *args
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxNavigationKeyEvent_IsFromTab",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NavigationKeyEvent_IsFromTab",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNavigationKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21675,7 +21741,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_IsFromTab(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxNavigationKeyEvent_SetFromTab(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_SetFromTab(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     bool arg2 ;
@@ -21685,7 +21751,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_SetFromTab(PyObject *, PyObject *arg
         (char *) "self",(char *) "bIs", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxNavigationKeyEvent_SetFromTab",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetFromTab",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNavigationKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21706,7 +21772,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_SetFromTab(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxNavigationKeyEvent_SetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_SetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     long arg2 ;
@@ -21716,7 +21782,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_SetFlags(PyObject *, PyObject *args,
         (char *) "self",(char *) "flags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxNavigationKeyEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNavigationKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21737,7 +21803,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_SetFlags(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxNavigationKeyEvent_GetCurrentFocus(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_GetCurrentFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     wxWindow *result;
@@ -21746,7 +21812,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_GetCurrentFocus(PyObject *, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxNavigationKeyEvent_GetCurrentFocus",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NavigationKeyEvent_GetCurrentFocus",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNavigationKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21765,7 +21831,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_GetCurrentFocus(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxNavigationKeyEvent_SetCurrentFocus(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_SetCurrentFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -21775,7 +21841,7 @@ static PyObject *_wrap_wxNavigationKeyEvent_SetCurrentFocus(PyObject *, PyObject
         (char *) "self",(char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxNavigationKeyEvent_SetCurrentFocus",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetCurrentFocus",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNavigationKeyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -21794,14 +21860,14 @@ static PyObject *_wrap_wxNavigationKeyEvent_SetCurrentFocus(PyObject *, PyObject
 }
 
 
-static PyObject * wxNavigationKeyEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * NavigationKeyEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxNavigationKeyEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxWindowCreateEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_WindowCreateEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
     wxWindowCreateEvent *result;
@@ -21810,7 +21876,7 @@ static PyObject *_wrap_new_wxWindowCreateEvent(PyObject *, PyObject *args, PyObj
         (char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxWindowCreateEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_WindowCreateEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
         SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -21829,7 +21895,7 @@ static PyObject *_wrap_new_wxWindowCreateEvent(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindowCreateEvent_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WindowCreateEvent_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindowCreateEvent *arg1 = (wxWindowCreateEvent *) 0 ;
     wxWindow *result;
@@ -21838,7 +21904,7 @@ static PyObject *_wrap_wxWindowCreateEvent_GetWindow(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindowCreateEvent_GetWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:WindowCreateEvent_GetWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindowCreateEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21857,14 +21923,14 @@ static PyObject *_wrap_wxWindowCreateEvent_GetWindow(PyObject *, PyObject *args,
 }
 
 
-static PyObject * wxWindowCreateEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * WindowCreateEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxWindowCreateEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxWindowDestroyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_WindowDestroyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
     wxWindowDestroyEvent *result;
@@ -21873,7 +21939,7 @@ static PyObject *_wrap_new_wxWindowDestroyEvent(PyObject *, PyObject *args, PyOb
         (char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxWindowDestroyEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_WindowDestroyEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
         SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -21892,7 +21958,7 @@ static PyObject *_wrap_new_wxWindowDestroyEvent(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxWindowDestroyEvent_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WindowDestroyEvent_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindowDestroyEvent *arg1 = (wxWindowDestroyEvent *) 0 ;
     wxWindow *result;
@@ -21901,7 +21967,7 @@ static PyObject *_wrap_wxWindowDestroyEvent_GetWindow(PyObject *, PyObject *args
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindowDestroyEvent_GetWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:WindowDestroyEvent_GetWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindowDestroyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -21920,14 +21986,14 @@ static PyObject *_wrap_wxWindowDestroyEvent_GetWindow(PyObject *, PyObject *args
 }
 
 
-static PyObject * wxWindowDestroyEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * WindowDestroyEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxWindowDestroyEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxContextMenuEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ContextMenuEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -21942,7 +22008,7 @@ static PyObject *_wrap_new_wxContextMenuEvent(PyObject *, PyObject *args, PyObje
         (char *) "type",(char *) "winid",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_wxContextMenuEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ContextMenuEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
         {
             arg1 = (wxEventType)(SWIG_As_int(obj0)); 
@@ -21975,7 +22041,7 @@ static PyObject *_wrap_new_wxContextMenuEvent(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxContextMenuEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ContextMenuEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxContextMenuEvent *arg1 = (wxContextMenuEvent *) 0 ;
     wxPoint *result;
@@ -21984,7 +22050,7 @@ static PyObject *_wrap_wxContextMenuEvent_GetPosition(PyObject *, PyObject *args
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxContextMenuEvent_GetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ContextMenuEvent_GetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxContextMenuEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22004,7 +22070,7 @@ static PyObject *_wrap_wxContextMenuEvent_GetPosition(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxContextMenuEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ContextMenuEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxContextMenuEvent *arg1 = (wxContextMenuEvent *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -22015,7 +22081,7 @@ static PyObject *_wrap_wxContextMenuEvent_SetPosition(PyObject *, PyObject *args
         (char *) "self",(char *) "pos", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxContextMenuEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ContextMenuEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxContextMenuEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22036,21 +22102,21 @@ static PyObject *_wrap_wxContextMenuEvent_SetPosition(PyObject *, PyObject *args
 }
 
 
-static PyObject * wxContextMenuEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * ContextMenuEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxContextMenuEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxIdleEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_IdleEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIdleEvent *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxIdleEvent",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_IdleEvent",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxIdleEvent *)new wxIdleEvent();
@@ -22065,7 +22131,7 @@ static PyObject *_wrap_new_wxIdleEvent(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxIdleEvent_RequestMore(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IdleEvent_RequestMore(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIdleEvent *arg1 = (wxIdleEvent *) 0 ;
     bool arg2 = (bool) true ;
@@ -22075,7 +22141,7 @@ static PyObject *_wrap_wxIdleEvent_RequestMore(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "needMore", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxIdleEvent_RequestMore",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:IdleEvent_RequestMore",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIdleEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -22098,7 +22164,7 @@ static PyObject *_wrap_wxIdleEvent_RequestMore(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxIdleEvent_MoreRequested(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IdleEvent_MoreRequested(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIdleEvent *arg1 = (wxIdleEvent *) 0 ;
     bool result;
@@ -22107,7 +22173,7 @@ static PyObject *_wrap_wxIdleEvent_MoreRequested(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIdleEvent_MoreRequested",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IdleEvent_MoreRequested",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIdleEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22126,7 +22192,7 @@ static PyObject *_wrap_wxIdleEvent_MoreRequested(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxIdleEvent_SetMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IdleEvent_SetMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIdleMode arg1 ;
     PyObject * obj0 = 0 ;
@@ -22134,7 +22200,7 @@ static PyObject *_wrap_wxIdleEvent_SetMode(PyObject *, PyObject *args, PyObject
         (char *) "mode", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIdleEvent_SetMode",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IdleEvent_SetMode",kwnames,&obj0)) goto fail;
     {
         arg1 = (wxIdleMode)(SWIG_As_int(obj0)); 
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -22153,14 +22219,14 @@ static PyObject *_wrap_wxIdleEvent_SetMode(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxIdleEvent_GetMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IdleEvent_GetMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIdleMode result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxIdleEvent_GetMode",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":IdleEvent_GetMode",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxIdleMode)wxIdleEvent::GetMode();
@@ -22175,7 +22241,7 @@ static PyObject *_wrap_wxIdleEvent_GetMode(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxIdleEvent_CanSend(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IdleEvent_CanSend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -22184,7 +22250,7 @@ static PyObject *_wrap_wxIdleEvent_CanSend(PyObject *, PyObject *args, PyObject
         (char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIdleEvent_CanSend",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IdleEvent_CanSend",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22203,14 +22269,14 @@ static PyObject *_wrap_wxIdleEvent_CanSend(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject * wxIdleEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * IdleEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxIdleEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxPyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxEventType arg2 = (wxEventType) wxEVT_NULL ;
@@ -22218,10 +22284,10 @@ static PyObject *_wrap_new_wxPyEvent(PyObject *, PyObject *args, PyObject *kwarg
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "winid",(char *) "commandType", NULL 
+        (char *) "winid",(char *) "eventType", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxPyEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -22248,7 +22314,7 @@ static PyObject *_wrap_new_wxPyEvent(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_delete_wxPyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEvent *arg1 = (wxPyEvent *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22256,7 +22322,7 @@ static PyObject *_wrap_delete_wxPyEvent(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxPyEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PyEvent",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22273,7 +22339,7 @@ static PyObject *_wrap_delete_wxPyEvent(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxPyEvent_SetSelf(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEvent__SetSelf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEvent *arg1 = (wxPyEvent *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -22283,7 +22349,7 @@ static PyObject *_wrap_wxPyEvent_SetSelf(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPyEvent_SetSelf",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEvent__SetSelf",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -22301,7 +22367,7 @@ static PyObject *_wrap_wxPyEvent_SetSelf(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxPyEvent_GetSelf(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEvent__GetSelf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEvent *arg1 = (wxPyEvent *) 0 ;
     PyObject *result;
@@ -22310,7 +22376,7 @@ static PyObject *_wrap_wxPyEvent_GetSelf(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyEvent_GetSelf",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyEvent__GetSelf",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22327,14 +22393,14 @@ static PyObject *_wrap_wxPyEvent_GetSelf(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject * wxPyEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxPyCommandEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyCommandEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -22342,10 +22408,10 @@ static PyObject *_wrap_new_wxPyCommandEvent(PyObject *, PyObject *args, PyObject
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "commandType",(char *) "id", NULL 
+        (char *) "eventType",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxPyCommandEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyCommandEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (wxEventType)(SWIG_As_int(obj0)); 
@@ -22372,7 +22438,7 @@ static PyObject *_wrap_new_wxPyCommandEvent(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_delete_wxPyCommandEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PyCommandEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCommandEvent *arg1 = (wxPyCommandEvent *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22380,7 +22446,7 @@ static PyObject *_wrap_delete_wxPyCommandEvent(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxPyCommandEvent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PyCommandEvent",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCommandEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22397,7 +22463,7 @@ static PyObject *_wrap_delete_wxPyCommandEvent(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxPyCommandEvent_SetSelf(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCommandEvent__SetSelf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCommandEvent *arg1 = (wxPyCommandEvent *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -22407,7 +22473,7 @@ static PyObject *_wrap_wxPyCommandEvent_SetSelf(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPyCommandEvent_SetSelf",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCommandEvent__SetSelf",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCommandEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -22425,7 +22491,7 @@ static PyObject *_wrap_wxPyCommandEvent_SetSelf(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxPyCommandEvent_GetSelf(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCommandEvent__GetSelf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCommandEvent *arg1 = (wxPyCommandEvent *) 0 ;
     PyObject *result;
@@ -22434,7 +22500,7 @@ static PyObject *_wrap_wxPyCommandEvent_GetSelf(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyCommandEvent_GetSelf",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCommandEvent__GetSelf",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCommandEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22451,14 +22517,14 @@ static PyObject *_wrap_wxPyCommandEvent_GetSelf(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject * wxPyCommandEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyCommandEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyCommandEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxDateEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DateEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -22471,7 +22537,7 @@ static PyObject *_wrap_new_wxDateEvent(PyObject *, PyObject *args, PyObject *kwa
         (char *) "win",(char *) "dt",(char *) "type", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_wxDateEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_DateEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22500,7 +22566,7 @@ static PyObject *_wrap_new_wxDateEvent(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxDateEvent_GetDate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateEvent_GetDate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateEvent *arg1 = (wxDateEvent *) 0 ;
     wxDateTime *result;
@@ -22509,7 +22575,7 @@ static PyObject *_wrap_wxDateEvent_GetDate(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxDateEvent_GetDate",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateEvent_GetDate",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDateEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22529,7 +22595,7 @@ static PyObject *_wrap_wxDateEvent_GetDate(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxDateEvent_SetDate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateEvent_SetDate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateEvent *arg1 = (wxDateEvent *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -22539,7 +22605,7 @@ static PyObject *_wrap_wxDateEvent_SetDate(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "date", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxDateEvent_SetDate",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateEvent_SetDate",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDateEvent, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22564,21 +22630,21 @@ static PyObject *_wrap_wxDateEvent_SetDate(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject * wxDateEvent_swigregister(PyObject *, PyObject *args) {
+static PyObject * DateEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDateEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxPyApp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyApp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxPyApp",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PyApp",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyApp *)new_wxPyApp();
@@ -22593,7 +22659,7 @@ static PyObject *_wrap_new_wxPyApp(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_delete_wxPyApp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PyApp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22601,7 +22667,7 @@ static PyObject *_wrap_delete_wxPyApp(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxPyApp",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PyApp",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22618,26 +22684,32 @@ static PyObject *_wrap_delete_wxPyApp(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxPyApp__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
     PyObject *arg3 = (PyObject *) 0 ;
+    bool arg4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "self",(char *) "_class", NULL 
+        (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxPyApp__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyApp__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
+    {
+        arg4 = (bool)(SWIG_As_bool(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
+    }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->_setCallbackInfo(arg2,arg3);
+        (arg1)->_setCallbackInfo(arg2,arg3,arg4);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -22649,7 +22721,7 @@ static PyObject *_wrap_wxPyApp__setCallbackInfo(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxPyApp_GetAppName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetAppName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString result;
@@ -22658,7 +22730,7 @@ static PyObject *_wrap_wxPyApp_GetAppName(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_GetAppName",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetAppName",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22681,7 +22753,7 @@ static PyObject *_wrap_wxPyApp_GetAppName(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxPyApp_SetAppName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetAppName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString *arg2 = 0 ;
@@ -22692,7 +22764,7 @@ static PyObject *_wrap_wxPyApp_SetAppName(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPyApp_SetAppName",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetAppName",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22722,7 +22794,7 @@ static PyObject *_wrap_wxPyApp_SetAppName(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxPyApp_GetClassName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetClassName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString result;
@@ -22731,7 +22803,7 @@ static PyObject *_wrap_wxPyApp_GetClassName(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_GetClassName",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetClassName",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22754,7 +22826,7 @@ static PyObject *_wrap_wxPyApp_GetClassName(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxPyApp_SetClassName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetClassName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString *arg2 = 0 ;
@@ -22765,7 +22837,7 @@ static PyObject *_wrap_wxPyApp_SetClassName(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPyApp_SetClassName",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetClassName",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22795,7 +22867,7 @@ static PyObject *_wrap_wxPyApp_SetClassName(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxPyApp_GetVendorName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetVendorName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString *result;
@@ -22804,7 +22876,7 @@ static PyObject *_wrap_wxPyApp_GetVendorName(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_GetVendorName",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetVendorName",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22830,7 +22902,7 @@ static PyObject *_wrap_wxPyApp_GetVendorName(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxPyApp_SetVendorName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetVendorName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString *arg2 = 0 ;
@@ -22841,7 +22913,7 @@ static PyObject *_wrap_wxPyApp_SetVendorName(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPyApp_SetVendorName",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetVendorName",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22871,7 +22943,7 @@ static PyObject *_wrap_wxPyApp_SetVendorName(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxPyApp_GetTraits(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetTraits(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxAppTraits *result;
@@ -22880,7 +22952,7 @@ static PyObject *_wrap_wxPyApp_GetTraits(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_GetTraits",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetTraits",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22897,7 +22969,7 @@ static PyObject *_wrap_wxPyApp_GetTraits(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxPyApp_ProcessPendingEvents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_ProcessPendingEvents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22905,7 +22977,7 @@ static PyObject *_wrap_wxPyApp_ProcessPendingEvents(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_ProcessPendingEvents",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_ProcessPendingEvents",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22922,7 +22994,7 @@ static PyObject *_wrap_wxPyApp_ProcessPendingEvents(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxPyApp_Yield(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_Yield(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool arg2 = (bool) false ;
@@ -22933,7 +23005,7 @@ static PyObject *_wrap_wxPyApp_Yield(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "onlyIfNeeded", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxPyApp_Yield",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyApp_Yield",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -22958,7 +23030,7 @@ static PyObject *_wrap_wxPyApp_Yield(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxPyApp_WakeUpIdle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_WakeUpIdle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22966,7 +23038,7 @@ static PyObject *_wrap_wxPyApp_WakeUpIdle(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_WakeUpIdle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_WakeUpIdle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -22983,14 +23055,14 @@ static PyObject *_wrap_wxPyApp_WakeUpIdle(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxPyApp_IsMainLoopRunning(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_IsMainLoopRunning(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxPyApp_IsMainLoopRunning",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":PyApp_IsMainLoopRunning",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)wxPyApp::IsMainLoopRunning();
@@ -23007,7 +23079,7 @@ static PyObject *_wrap_wxPyApp_IsMainLoopRunning(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxPyApp_MainLoop(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_MainLoop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     int result;
@@ -23016,7 +23088,7 @@ static PyObject *_wrap_wxPyApp_MainLoop(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_MainLoop",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_MainLoop",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23035,7 +23107,7 @@ static PyObject *_wrap_wxPyApp_MainLoop(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxPyApp_Exit(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_Exit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject * obj0 = 0 ;
@@ -23043,7 +23115,7 @@ static PyObject *_wrap_wxPyApp_Exit(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_Exit",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_Exit",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23060,7 +23132,7 @@ static PyObject *_wrap_wxPyApp_Exit(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxPyApp_ExitMainLoop(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_ExitMainLoop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject * obj0 = 0 ;
@@ -23068,7 +23140,7 @@ static PyObject *_wrap_wxPyApp_ExitMainLoop(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_ExitMainLoop",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_ExitMainLoop",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23085,7 +23157,7 @@ static PyObject *_wrap_wxPyApp_ExitMainLoop(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxPyApp_Pending(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_Pending(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool result;
@@ -23094,7 +23166,7 @@ static PyObject *_wrap_wxPyApp_Pending(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_Pending",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_Pending",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23113,7 +23185,7 @@ static PyObject *_wrap_wxPyApp_Pending(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxPyApp_Dispatch(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_Dispatch(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool result;
@@ -23122,7 +23194,7 @@ static PyObject *_wrap_wxPyApp_Dispatch(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_Dispatch",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_Dispatch",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23141,7 +23213,7 @@ static PyObject *_wrap_wxPyApp_Dispatch(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxPyApp_ProcessIdle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_ProcessIdle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool result;
@@ -23150,7 +23222,7 @@ static PyObject *_wrap_wxPyApp_ProcessIdle(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_ProcessIdle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_ProcessIdle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23169,7 +23241,7 @@ static PyObject *_wrap_wxPyApp_ProcessIdle(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxPyApp_SendIdleEvents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SendIdleEvents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -23182,7 +23254,7 @@ static PyObject *_wrap_wxPyApp_SendIdleEvents(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "win",(char *) "event", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxPyApp_SendIdleEvents",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyApp_SendIdleEvents",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -23211,7 +23283,7 @@ static PyObject *_wrap_wxPyApp_SendIdleEvents(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxPyApp_IsActive(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_IsActive(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool result;
@@ -23220,7 +23292,7 @@ static PyObject *_wrap_wxPyApp_IsActive(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_IsActive",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_IsActive",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23239,7 +23311,7 @@ static PyObject *_wrap_wxPyApp_IsActive(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxPyApp_SetTopWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetTopWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -23249,7 +23321,7 @@ static PyObject *_wrap_wxPyApp_SetTopWindow(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPyApp_SetTopWindow",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetTopWindow",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -23268,7 +23340,7 @@ static PyObject *_wrap_wxPyApp_SetTopWindow(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetTopWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxWindow *result;
@@ -23277,7 +23349,7 @@ static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_GetTopWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetTopWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23296,7 +23368,7 @@ static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxPyApp_SetExitOnFrameDelete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetExitOnFrameDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool arg2 ;
@@ -23306,7 +23378,7 @@ static PyObject *_wrap_wxPyApp_SetExitOnFrameDelete(PyObject *, PyObject *args,
         (char *) "self",(char *) "flag", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPyApp_SetExitOnFrameDelete",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetExitOnFrameDelete",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23327,7 +23399,7 @@ static PyObject *_wrap_wxPyApp_SetExitOnFrameDelete(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxPyApp_GetExitOnFrameDelete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetExitOnFrameDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool result;
@@ -23336,7 +23408,7 @@ static PyObject *_wrap_wxPyApp_GetExitOnFrameDelete(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_GetExitOnFrameDelete",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetExitOnFrameDelete",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23355,7 +23427,7 @@ static PyObject *_wrap_wxPyApp_GetExitOnFrameDelete(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxPyApp_SetUseBestVisual(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetUseBestVisual(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool arg2 ;
@@ -23365,7 +23437,7 @@ static PyObject *_wrap_wxPyApp_SetUseBestVisual(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "flag", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPyApp_SetUseBestVisual",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetUseBestVisual",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23386,7 +23458,7 @@ static PyObject *_wrap_wxPyApp_SetUseBestVisual(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxPyApp_GetUseBestVisual(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetUseBestVisual(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool result;
@@ -23395,7 +23467,7 @@ static PyObject *_wrap_wxPyApp_GetUseBestVisual(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_GetUseBestVisual",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetUseBestVisual",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23414,7 +23486,7 @@ static PyObject *_wrap_wxPyApp_GetUseBestVisual(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxPyApp_SetPrintMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetPrintMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     int arg2 ;
@@ -23424,7 +23496,7 @@ static PyObject *_wrap_wxPyApp_SetPrintMode(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "mode", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPyApp_SetPrintMode",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetPrintMode",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23445,7 +23517,7 @@ static PyObject *_wrap_wxPyApp_SetPrintMode(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxPyApp_GetPrintMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetPrintMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     int result;
@@ -23454,7 +23526,7 @@ static PyObject *_wrap_wxPyApp_GetPrintMode(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_GetPrintMode",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetPrintMode",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23473,7 +23545,7 @@ static PyObject *_wrap_wxPyApp_GetPrintMode(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxPyApp_SetAssertMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetAssertMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     int arg2 ;
@@ -23483,7 +23555,7 @@ static PyObject *_wrap_wxPyApp_SetAssertMode(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "mode", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPyApp_SetAssertMode",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetAssertMode",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23504,7 +23576,7 @@ static PyObject *_wrap_wxPyApp_SetAssertMode(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxPyApp_GetAssertMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetAssertMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     int result;
@@ -23513,7 +23585,7 @@ static PyObject *_wrap_wxPyApp_GetAssertMode(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_GetAssertMode",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetAssertMode",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23532,14 +23604,14 @@ static PyObject *_wrap_wxPyApp_GetAssertMode(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxPyApp_GetMacSupportPCMenuShortcuts(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetMacSupportPCMenuShortcuts(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxPyApp_GetMacSupportPCMenuShortcuts",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":PyApp_GetMacSupportPCMenuShortcuts",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)wxPyApp::GetMacSupportPCMenuShortcuts();
@@ -23556,14 +23628,14 @@ static PyObject *_wrap_wxPyApp_GetMacSupportPCMenuShortcuts(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxPyApp_GetMacAboutMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetMacAboutMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxPyApp_GetMacAboutMenuItemId",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":PyApp_GetMacAboutMenuItemId",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (long)wxPyApp::GetMacAboutMenuItemId();
@@ -23580,14 +23652,14 @@ static PyObject *_wrap_wxPyApp_GetMacAboutMenuItemId(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxPyApp_GetMacPreferencesMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetMacPreferencesMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxPyApp_GetMacPreferencesMenuItemId",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":PyApp_GetMacPreferencesMenuItemId",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (long)wxPyApp::GetMacPreferencesMenuItemId();
@@ -23604,14 +23676,14 @@ static PyObject *_wrap_wxPyApp_GetMacPreferencesMenuItemId(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxPyApp_GetMacExitMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetMacExitMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxPyApp_GetMacExitMenuItemId",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":PyApp_GetMacExitMenuItemId",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (long)wxPyApp::GetMacExitMenuItemId();
@@ -23628,14 +23700,14 @@ static PyObject *_wrap_wxPyApp_GetMacExitMenuItemId(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxPyApp_GetMacHelpMenuTitleName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetMacHelpMenuTitleName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxPyApp_GetMacHelpMenuTitleName",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":PyApp_GetMacHelpMenuTitleName",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxPyApp::GetMacHelpMenuTitleName();
@@ -23656,7 +23728,7 @@ static PyObject *_wrap_wxPyApp_GetMacHelpMenuTitleName(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxPyApp_SetMacSupportPCMenuShortcuts(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetMacSupportPCMenuShortcuts(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool arg1 ;
     PyObject * obj0 = 0 ;
@@ -23664,7 +23736,7 @@ static PyObject *_wrap_wxPyApp_SetMacSupportPCMenuShortcuts(PyObject *, PyObject
         (char *) "val", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_SetMacSupportPCMenuShortcuts",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacSupportPCMenuShortcuts",kwnames,&obj0)) goto fail;
     {
         arg1 = (bool)(SWIG_As_bool(obj0)); 
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -23683,7 +23755,7 @@ static PyObject *_wrap_wxPyApp_SetMacSupportPCMenuShortcuts(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxPyApp_SetMacAboutMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetMacAboutMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     PyObject * obj0 = 0 ;
@@ -23691,7 +23763,7 @@ static PyObject *_wrap_wxPyApp_SetMacAboutMenuItemId(PyObject *, PyObject *args,
         (char *) "val", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_SetMacAboutMenuItemId",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacAboutMenuItemId",kwnames,&obj0)) goto fail;
     {
         arg1 = (long)(SWIG_As_long(obj0)); 
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -23710,7 +23782,7 @@ static PyObject *_wrap_wxPyApp_SetMacAboutMenuItemId(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxPyApp_SetMacPreferencesMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetMacPreferencesMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     PyObject * obj0 = 0 ;
@@ -23718,7 +23790,7 @@ static PyObject *_wrap_wxPyApp_SetMacPreferencesMenuItemId(PyObject *, PyObject
         (char *) "val", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_SetMacPreferencesMenuItemId",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacPreferencesMenuItemId",kwnames,&obj0)) goto fail;
     {
         arg1 = (long)(SWIG_As_long(obj0)); 
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -23737,7 +23809,7 @@ static PyObject *_wrap_wxPyApp_SetMacPreferencesMenuItemId(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxPyApp_SetMacExitMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetMacExitMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     PyObject * obj0 = 0 ;
@@ -23745,7 +23817,7 @@ static PyObject *_wrap_wxPyApp_SetMacExitMenuItemId(PyObject *, PyObject *args,
         (char *) "val", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_SetMacExitMenuItemId",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacExitMenuItemId",kwnames,&obj0)) goto fail;
     {
         arg1 = (long)(SWIG_As_long(obj0)); 
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -23764,7 +23836,7 @@ static PyObject *_wrap_wxPyApp_SetMacExitMenuItemId(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxPyApp_SetMacHelpMenuTitleName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetMacHelpMenuTitleName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = false ;
@@ -23773,7 +23845,7 @@ static PyObject *_wrap_wxPyApp_SetMacHelpMenuTitleName(PyObject *, PyObject *arg
         (char *) "val", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp_SetMacHelpMenuTitleName",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacHelpMenuTitleName",kwnames,&obj0)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
@@ -23801,7 +23873,7 @@ static PyObject *_wrap_wxPyApp_SetMacHelpMenuTitleName(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxPyApp__BootstrapApp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp__BootstrapApp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject * obj0 = 0 ;
@@ -23809,7 +23881,7 @@ static PyObject *_wrap_wxPyApp__BootstrapApp(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxPyApp__BootstrapApp",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp__BootstrapApp",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -23826,17 +23898,17 @@ static PyObject *_wrap_wxPyApp__BootstrapApp(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxPyApp_GetComCtl32Version(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetComCtl32Version(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxPyApp_GetComCtl32Version",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":PyApp_GetComCtl32Version",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (int)wxPyApp_GetComCtl32Version();
+        result = (int)PyApp_GetComCtl32Version();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -23850,20 +23922,20 @@ static PyObject *_wrap_wxPyApp_GetComCtl32Version(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject * wxPyApp_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyApp_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyApp, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxExit(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Exit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxExit",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":Exit",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxExit();
@@ -23878,14 +23950,14 @@ static PyObject *_wrap_wxExit(PyObject *, PyObject *args, PyObject *kwargs) {
 }
 
 
-static PyObject *_wrap_wxYield(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Yield(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxYield",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":Yield",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)wxYield();
@@ -23902,14 +23974,14 @@ static PyObject *_wrap_wxYield(PyObject *, PyObject *args, PyObject *kwargs) {
 }
 
 
-static PyObject *_wrap_wxYieldIfNeeded(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_YieldIfNeeded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxYieldIfNeeded",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":YieldIfNeeded",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)wxYieldIfNeeded();
@@ -23926,7 +23998,7 @@ static PyObject *_wrap_wxYieldIfNeeded(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxSafeYield(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SafeYield(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
     bool arg2 = (bool) false ;
@@ -23937,7 +24009,7 @@ static PyObject *_wrap_wxSafeYield(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "win",(char *) "onlyIfNeeded", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:wxSafeYield",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:SafeYield",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -23964,13 +24036,13 @@ static PyObject *_wrap_wxSafeYield(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_wxWakeUpIdle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WakeUpIdle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxWakeUpIdle",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":WakeUpIdle",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxWakeUpIdle();
@@ -23985,7 +24057,7 @@ static PyObject *_wrap_wxWakeUpIdle(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxPostEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PostEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvent *arg2 = 0 ;
@@ -23995,7 +24067,7 @@ static PyObject *_wrap_wxPostEvent(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "dest",(char *) "event", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxPostEvent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PostEvent",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24020,13 +24092,13 @@ static PyObject *_wrap_wxPostEvent(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_wxApp_CleanUp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_App_CleanUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxApp_CleanUp",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":App_CleanUp",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxApp_CleanUp();
@@ -24065,7 +24137,7 @@ static PyObject *_wrap_GetApp(PyObject *, PyObject *args, PyObject *kwargs) {
 }
 
 
-static PyObject *_wrap_wxSetDefaultPyEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SetDefaultPyEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *arg1 = (char *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24073,7 +24145,7 @@ static PyObject *_wrap_wxSetDefaultPyEncoding(PyObject *, PyObject *args, PyObje
         (char *) "encoding", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSetDefaultPyEncoding",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SetDefaultPyEncoding",kwnames,&obj0)) goto fail;
     if (!SWIG_AsCharPtr(obj0, (char**)&arg1)) {
         SWIG_arg_fail(1);SWIG_fail;
     }
@@ -24091,14 +24163,14 @@ static PyObject *_wrap_wxSetDefaultPyEncoding(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxGetDefaultPyEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetDefaultPyEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxGetDefaultPyEncoding",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":GetDefaultPyEncoding",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (char *)wxGetDefaultPyEncoding();
@@ -24113,14 +24185,14 @@ static PyObject *_wrap_wxGetDefaultPyEncoding(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_new_wxEventLoop(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_EventLoop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventLoop *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxEventLoop",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_EventLoop",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxEventLoop *)new wxEventLoop();
@@ -24135,7 +24207,7 @@ static PyObject *_wrap_new_wxEventLoop(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_delete_wxEventLoop(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_EventLoop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventLoop *arg1 = (wxEventLoop *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24143,7 +24215,7 @@ static PyObject *_wrap_delete_wxEventLoop(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxEventLoop",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_EventLoop",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEventLoop, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24160,7 +24232,7 @@ static PyObject *_wrap_delete_wxEventLoop(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxEventLoop_Run(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EventLoop_Run(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventLoop *arg1 = (wxEventLoop *) 0 ;
     int result;
@@ -24169,7 +24241,7 @@ static PyObject *_wrap_wxEventLoop_Run(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEventLoop_Run",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EventLoop_Run",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEventLoop, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24188,7 +24260,7 @@ static PyObject *_wrap_wxEventLoop_Run(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxEventLoop_Exit(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EventLoop_Exit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventLoop *arg1 = (wxEventLoop *) 0 ;
     int arg2 = (int) 0 ;
@@ -24198,7 +24270,7 @@ static PyObject *_wrap_wxEventLoop_Exit(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "rc", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxEventLoop_Exit",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:EventLoop_Exit",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEventLoop, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -24221,7 +24293,7 @@ static PyObject *_wrap_wxEventLoop_Exit(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxEventLoop_Pending(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EventLoop_Pending(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventLoop *arg1 = (wxEventLoop *) 0 ;
     bool result;
@@ -24230,7 +24302,7 @@ static PyObject *_wrap_wxEventLoop_Pending(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEventLoop_Pending",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EventLoop_Pending",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEventLoop, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24249,7 +24321,7 @@ static PyObject *_wrap_wxEventLoop_Pending(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxEventLoop_Dispatch(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EventLoop_Dispatch(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventLoop *arg1 = (wxEventLoop *) 0 ;
     bool result;
@@ -24258,7 +24330,7 @@ static PyObject *_wrap_wxEventLoop_Dispatch(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEventLoop_Dispatch",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EventLoop_Dispatch",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEventLoop, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24277,7 +24349,7 @@ static PyObject *_wrap_wxEventLoop_Dispatch(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxEventLoop_IsRunning(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EventLoop_IsRunning(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventLoop *arg1 = (wxEventLoop *) 0 ;
     bool result;
@@ -24286,7 +24358,7 @@ static PyObject *_wrap_wxEventLoop_IsRunning(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEventLoop_IsRunning",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EventLoop_IsRunning",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEventLoop, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24305,14 +24377,14 @@ static PyObject *_wrap_wxEventLoop_IsRunning(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxEventLoop_GetActive(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EventLoop_GetActive(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventLoop *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxEventLoop_GetActive",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":EventLoop_GetActive",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxEventLoop *)wxEventLoop::GetActive();
@@ -24327,7 +24399,7 @@ static PyObject *_wrap_wxEventLoop_GetActive(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxEventLoop_SetActive(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EventLoop_SetActive(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventLoop *arg1 = (wxEventLoop *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24335,7 +24407,7 @@ static PyObject *_wrap_wxEventLoop_SetActive(PyObject *, PyObject *args, PyObjec
         (char *) "loop", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxEventLoop_SetActive",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EventLoop_SetActive",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxEventLoop, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24352,14 +24424,14 @@ static PyObject *_wrap_wxEventLoop_SetActive(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject * wxEventLoop_swigregister(PyObject *, PyObject *args) {
+static PyObject * EventLoop_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxEventLoop, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_AcceleratorEntry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -24372,7 +24444,7 @@ static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *, PyObject *args, PyObje
         (char *) "flags",(char *) "keyCode",(char *) "cmdID", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_wxAcceleratorEntry",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_AcceleratorEntry",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -24405,7 +24477,7 @@ static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_wxAcceleratorEntry(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_AcceleratorEntry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24413,7 +24485,7 @@ static PyObject *_wrap_delete_wxAcceleratorEntry(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxAcceleratorEntry",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_AcceleratorEntry",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxAcceleratorEntry, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24430,7 +24502,7 @@ static PyObject *_wrap_delete_wxAcceleratorEntry(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxAcceleratorEntry_Set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AcceleratorEntry_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
     int arg2 ;
@@ -24444,7 +24516,7 @@ static PyObject *_wrap_wxAcceleratorEntry_Set(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "flags",(char *) "keyCode",(char *) "cmd", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxAcceleratorEntry_Set",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AcceleratorEntry_Set",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxAcceleratorEntry, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24473,7 +24545,7 @@ static PyObject *_wrap_wxAcceleratorEntry_Set(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxAcceleratorEntry_GetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AcceleratorEntry_GetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
     int result;
@@ -24482,7 +24554,7 @@ static PyObject *_wrap_wxAcceleratorEntry_GetFlags(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxAcceleratorEntry_GetFlags",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetFlags",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxAcceleratorEntry, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24501,7 +24573,7 @@ static PyObject *_wrap_wxAcceleratorEntry_GetFlags(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxAcceleratorEntry_GetKeyCode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AcceleratorEntry_GetKeyCode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
     int result;
@@ -24510,7 +24582,7 @@ static PyObject *_wrap_wxAcceleratorEntry_GetKeyCode(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxAcceleratorEntry_GetKeyCode",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetKeyCode",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxAcceleratorEntry, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24529,7 +24601,7 @@ static PyObject *_wrap_wxAcceleratorEntry_GetKeyCode(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxAcceleratorEntry_GetCommand(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AcceleratorEntry_GetCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
     int result;
@@ -24538,7 +24610,7 @@ static PyObject *_wrap_wxAcceleratorEntry_GetCommand(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxAcceleratorEntry_GetCommand",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetCommand",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxAcceleratorEntry, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24557,14 +24629,14 @@ static PyObject *_wrap_wxAcceleratorEntry_GetCommand(PyObject *, PyObject *args,
 }
 
 
-static PyObject * wxAcceleratorEntry_swigregister(PyObject *, PyObject *args) {
+static PyObject * AcceleratorEntry_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorEntry, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxAcceleratorTable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_AcceleratorTable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxAcceleratorEntry *arg2 = (wxAcceleratorEntry *) 0 ;
@@ -24574,7 +24646,7 @@ static PyObject *_wrap_new_wxAcceleratorTable(PyObject *, PyObject *args, PyObje
         (char *) "n", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_wxAcceleratorTable",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_AcceleratorTable",kwnames,&obj0)) goto fail;
     {
         arg2 = wxAcceleratorEntry_LIST_helper(obj0);
         if (arg2) arg1 = PyList_Size(obj0);
@@ -24600,7 +24672,7 @@ static PyObject *_wrap_new_wxAcceleratorTable(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_wxAcceleratorTable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_AcceleratorTable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24608,7 +24680,7 @@ static PyObject *_wrap_delete_wxAcceleratorTable(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxAcceleratorTable",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_AcceleratorTable",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxAcceleratorTable, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24625,7 +24697,7 @@ static PyObject *_wrap_delete_wxAcceleratorTable(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxAcceleratorTable_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AcceleratorTable_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ;
     bool result;
@@ -24634,7 +24706,7 @@ static PyObject *_wrap_wxAcceleratorTable_Ok(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxAcceleratorTable_Ok",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorTable_Ok",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxAcceleratorTable, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24653,20 +24725,20 @@ static PyObject *_wrap_wxAcceleratorTable_Ok(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject * wxAcceleratorTable_swigregister(PyObject *, PyObject *args) {
+static PyObject * AcceleratorTable_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorTable, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_wxNullAcceleratorTable_set(PyObject *) {
-    PyErr_SetString(PyExc_TypeError,"Variable wxNullAcceleratorTable is read-only.");
+static int _wrap_NullAcceleratorTable_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable NullAcceleratorTable is read-only.");
     return 1;
 }
 
 
-static PyObject *_wrap_wxNullAcceleratorTable_get(void) {
+static PyObject *_wrap_NullAcceleratorTable_get(void) {
     PyObject *pyobj;
     
     pyobj = SWIG_NewPointerObj((void *)(&wxNullAcceleratorTable), SWIGTYPE_p_wxAcceleratorTable, 0);
@@ -24674,7 +24746,7 @@ static PyObject *_wrap_wxNullAcceleratorTable_get(void) {
 }
 
 
-static PyObject *_wrap_wxGetAccelFromString(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetAccelFromString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxAcceleratorEntry *result;
@@ -24684,7 +24756,7 @@ static PyObject *_wrap_wxGetAccelFromString(PyObject *, PyObject *args, PyObject
         (char *) "label", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGetAccelFromString",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetAccelFromString",kwnames,&obj0)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
@@ -24732,14 +24804,14 @@ static PyObject *_wrap_PanelNameStr_get(void) {
 }
 
 
-static PyObject *_wrap_new_wxVisualAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_VisualAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxVisualAttributes",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_VisualAttributes",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxVisualAttributes *)new_wxVisualAttributes();
@@ -24754,7 +24826,7 @@ static PyObject *_wrap_new_wxVisualAttributes(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_wxVisualAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_VisualAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24762,7 +24834,7 @@ static PyObject *_wrap_delete_wxVisualAttributes(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_wxVisualAttributes",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_VisualAttributes",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxVisualAttributes, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -24779,30 +24851,22 @@ static PyObject *_wrap_delete_wxVisualAttributes(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxVisualAttributes_font_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VisualAttributes_font_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-    wxFont arg2 ;
+    wxFont *arg2 = (wxFont *) 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "font", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxVisualAttributes_font_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VisualAttributes_font_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxVisualAttributes, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
-    {
-        wxFont * argp;
-        SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxFont, SWIG_POINTER_EXCEPTION);
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        if (argp == NULL) {
-            SWIG_null_ref("wxFont");
-        }
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        arg2 = *argp;
-    }
-    if (arg1) (arg1)->font = arg2;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxFont, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
+    if (arg1) (arg1)->font = *arg2;
     
     Py_INCREF(Py_None); resultobj = Py_None;
     return resultobj;
@@ -24811,55 +24875,43 @@ static PyObject *_wrap_wxVisualAttributes_font_set(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxVisualAttributes_font_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VisualAttributes_font_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-    wxFont result;
+    wxFont *result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxVisualAttributes_font_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:VisualAttributes_font_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxVisualAttributes, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
-    result =  ((arg1)->font);
+    result = (wxFont *)& ((arg1)->font);
     
-    {
-        wxFont * resultptr;
-        resultptr = new wxFont((wxFont &)(result));
-        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxFont, 1);
-    }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_wxVisualAttributes_colFg_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VisualAttributes_colFg_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-    wxColour arg2 ;
+    wxColour *arg2 = (wxColour *) 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "colFg", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxVisualAttributes_colFg_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VisualAttributes_colFg_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxVisualAttributes, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
-    {
-        wxColour * argp;
-        SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxColour, SWIG_POINTER_EXCEPTION);
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        if (argp == NULL) {
-            SWIG_null_ref("wxColour");
-        }
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        arg2 = *argp;
-    }
-    if (arg1) (arg1)->colFg = arg2;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxColour, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
+    if (arg1) (arg1)->colFg = *arg2;
     
     Py_INCREF(Py_None); resultobj = Py_None;
     return resultobj;
@@ -24868,55 +24920,43 @@ static PyObject *_wrap_wxVisualAttributes_colFg_set(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxVisualAttributes_colFg_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VisualAttributes_colFg_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-    wxColour result;
+    wxColour *result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxVisualAttributes_colFg_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:VisualAttributes_colFg_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxVisualAttributes, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
-    result =  ((arg1)->colFg);
+    result = (wxColour *)& ((arg1)->colFg);
     
-    {
-        wxColour * resultptr;
-        resultptr = new wxColour((wxColour &)(result));
-        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);
-    }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxColour, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_wxVisualAttributes_colBg_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VisualAttributes_colBg_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-    wxColour arg2 ;
+    wxColour *arg2 = (wxColour *) 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "colBg", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxVisualAttributes_colBg_set",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VisualAttributes_colBg_set",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxVisualAttributes, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
-    {
-        wxColour * argp;
-        SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxColour, SWIG_POINTER_EXCEPTION);
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        if (argp == NULL) {
-            SWIG_null_ref("wxColour");
-        }
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        arg2 = *argp;
-    }
-    if (arg1) (arg1)->colBg = arg2;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxColour, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
+    if (arg1) (arg1)->colBg = *arg2;
     
     Py_INCREF(Py_None); resultobj = Py_None;
     return resultobj;
@@ -24925,39 +24965,35 @@ static PyObject *_wrap_wxVisualAttributes_colBg_set(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxVisualAttributes_colBg_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VisualAttributes_colBg_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-    wxColour result;
+    wxColour *result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxVisualAttributes_colBg_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:VisualAttributes_colBg_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxVisualAttributes, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
-    result =  ((arg1)->colBg);
+    result = (wxColour *)& ((arg1)->colBg);
     
-    {
-        wxColour * resultptr;
-        resultptr = new wxColour((wxColour &)(result));
-        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);
-    }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxColour, 0);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * wxVisualAttributes_swigregister(PyObject *, PyObject *args) {
+static PyObject * VisualAttributes_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxVisualAttributes, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Window(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -24982,7 +25018,7 @@ static PyObject *_wrap_new_wxWindow(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_wxWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_Window",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -25062,7 +25098,7 @@ static PyObject *_wrap_new_PreWindow(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxWindow_Create(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -25089,7 +25125,7 @@ static PyObject *_wrap_wxWindow_Create(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:wxWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:Window_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -25149,7 +25185,7 @@ static PyObject *_wrap_wxWindow_Create(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxWindow_Close(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Close(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 = (bool) false ;
@@ -25160,7 +25196,7 @@ static PyObject *_wrap_wxWindow_Close(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "force", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxWindow_Close",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Close",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -25185,7 +25221,7 @@ static PyObject *_wrap_wxWindow_Close(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxWindow_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -25194,7 +25230,7 @@ static PyObject *_wrap_wxWindow_Destroy(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_Destroy",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Destroy",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25213,7 +25249,7 @@ static PyObject *_wrap_wxWindow_Destroy(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_DestroyChildren(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_DestroyChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -25222,7 +25258,7 @@ static PyObject *_wrap_wxWindow_DestroyChildren(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_DestroyChildren",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_DestroyChildren",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25241,7 +25277,7 @@ static PyObject *_wrap_wxWindow_DestroyChildren(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxWindow_IsBeingDeleted(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsBeingDeleted(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -25250,7 +25286,7 @@ static PyObject *_wrap_wxWindow_IsBeingDeleted(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_IsBeingDeleted",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_IsBeingDeleted",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25269,7 +25305,7 @@ static PyObject *_wrap_wxWindow_IsBeingDeleted(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_SetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -25280,7 +25316,7 @@ static PyObject *_wrap_wxWindow_SetTitle(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "title", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetTitle",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetTitle",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25310,7 +25346,7 @@ static PyObject *_wrap_wxWindow_SetTitle(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_GetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString result;
@@ -25319,7 +25355,7 @@ static PyObject *_wrap_wxWindow_GetTitle(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetTitle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetTitle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25342,7 +25378,7 @@ static PyObject *_wrap_wxWindow_GetTitle(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -25353,7 +25389,7 @@ static PyObject *_wrap_wxWindow_SetLabel(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "label", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetLabel",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetLabel",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25383,7 +25419,7 @@ static PyObject *_wrap_wxWindow_SetLabel(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString result;
@@ -25392,7 +25428,7 @@ static PyObject *_wrap_wxWindow_GetLabel(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetLabel",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetLabel",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25415,7 +25451,7 @@ static PyObject *_wrap_wxWindow_GetLabel(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_SetName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -25426,7 +25462,7 @@ static PyObject *_wrap_wxWindow_SetName(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetName",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetName",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25456,7 +25492,7 @@ static PyObject *_wrap_wxWindow_SetName(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString result;
@@ -25465,7 +25501,7 @@ static PyObject *_wrap_wxWindow_GetName(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetName",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetName",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25488,7 +25524,7 @@ static PyObject *_wrap_wxWindow_GetName(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_SetWindowVariant(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetWindowVariant(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindowVariant arg2 ;
@@ -25498,7 +25534,7 @@ static PyObject *_wrap_wxWindow_SetWindowVariant(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "variant", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetWindowVariant",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetWindowVariant",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25519,7 +25555,7 @@ static PyObject *_wrap_wxWindow_SetWindowVariant(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxWindow_GetWindowVariant(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetWindowVariant(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindowVariant result;
@@ -25528,7 +25564,7 @@ static PyObject *_wrap_wxWindow_GetWindowVariant(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetWindowVariant",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetWindowVariant",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25545,7 +25581,7 @@ static PyObject *_wrap_wxWindow_GetWindowVariant(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxWindow_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -25555,7 +25591,7 @@ static PyObject *_wrap_wxWindow_SetId(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "winid", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetId",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetId",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25576,7 +25612,7 @@ static PyObject *_wrap_wxWindow_SetId(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxWindow_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -25585,7 +25621,7 @@ static PyObject *_wrap_wxWindow_GetId(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetId",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetId",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25604,14 +25640,14 @@ static PyObject *_wrap_wxWindow_GetId(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxWindow_NewControlId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_NewControlId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxWindow_NewControlId",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":Window_NewControlId",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)wxWindow::NewControlId();
@@ -25628,7 +25664,7 @@ static PyObject *_wrap_wxWindow_NewControlId(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_NextControlId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_NextControlId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int result;
@@ -25637,7 +25673,7 @@ static PyObject *_wrap_wxWindow_NextControlId(PyObject *, PyObject *args, PyObje
         (char *) "winid", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_NextControlId",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_NextControlId",kwnames,&obj0)) goto fail;
     {
         arg1 = (int)(SWIG_As_int(obj0)); 
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -25658,7 +25694,7 @@ static PyObject *_wrap_wxWindow_NextControlId(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_PrevControlId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PrevControlId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int result;
@@ -25667,7 +25703,7 @@ static PyObject *_wrap_wxWindow_PrevControlId(PyObject *, PyObject *args, PyObje
         (char *) "winid", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_PrevControlId",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_PrevControlId",kwnames,&obj0)) goto fail;
     {
         arg1 = (int)(SWIG_As_int(obj0)); 
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -25688,7 +25724,7 @@ static PyObject *_wrap_wxWindow_PrevControlId(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -25699,7 +25735,7 @@ static PyObject *_wrap_wxWindow_SetSize(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "size", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetSize",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetSize",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25720,7 +25756,7 @@ static PyObject *_wrap_wxWindow_SetSize(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_SetDimensions(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetDimensions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -25738,7 +25774,7 @@ static PyObject *_wrap_wxWindow_SetDimensions(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:wxWindow_SetDimensions",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Window_SetDimensions",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25777,7 +25813,7 @@ static PyObject *_wrap_wxWindow_SetDimensions(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_SetRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect *arg2 = 0 ;
@@ -25790,7 +25826,7 @@ static PyObject *_wrap_wxWindow_SetRect(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "rect",(char *) "sizeFlags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxWindow_SetRect",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetRect",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25817,7 +25853,7 @@ static PyObject *_wrap_wxWindow_SetRect(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_SetSizeWH(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetSizeWH(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -25829,7 +25865,7 @@ static PyObject *_wrap_wxWindow_SetSizeWH(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxWindow_SetSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25854,7 +25890,7 @@ static PyObject *_wrap_wxWindow_SetSizeWH(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_Move(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Move(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -25867,7 +25903,7 @@ static PyObject *_wrap_wxWindow_Move(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "pt",(char *) "flags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxWindow_Move",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_Move",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25894,7 +25930,7 @@ static PyObject *_wrap_wxWindow_Move(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxWindow_MoveXY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_MoveXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -25908,7 +25944,7 @@ static PyObject *_wrap_wxWindow_MoveXY(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "x",(char *) "y",(char *) "flags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:wxWindow_MoveXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_MoveXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25939,7 +25975,7 @@ static PyObject *_wrap_wxWindow_MoveXY(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxWindow_SetBestFittingSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetBestFittingSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize const &arg2_defvalue = wxDefaultSize ;
@@ -25951,7 +25987,7 @@ static PyObject *_wrap_wxWindow_SetBestFittingSize(PyObject *, PyObject *args, P
         (char *) "self",(char *) "size", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxWindow_SetBestFittingSize",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_SetBestFittingSize",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -25974,7 +26010,7 @@ static PyObject *_wrap_wxWindow_SetBestFittingSize(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxWindow_Raise(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Raise(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -25982,7 +26018,7 @@ static PyObject *_wrap_wxWindow_Raise(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_Raise",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Raise",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25999,7 +26035,7 @@ static PyObject *_wrap_wxWindow_Raise(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxWindow_Lower(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Lower(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26007,7 +26043,7 @@ static PyObject *_wrap_wxWindow_Lower(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_Lower",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Lower",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26024,7 +26060,7 @@ static PyObject *_wrap_wxWindow_Lower(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxWindow_SetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -26035,7 +26071,7 @@ static PyObject *_wrap_wxWindow_SetClientSize(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "size", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetClientSize",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetClientSize",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26056,7 +26092,7 @@ static PyObject *_wrap_wxWindow_SetClientSize(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_SetClientSizeWH(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetClientSizeWH(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -26068,7 +26104,7 @@ static PyObject *_wrap_wxWindow_SetClientSizeWH(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxWindow_SetClientSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetClientSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26093,7 +26129,7 @@ static PyObject *_wrap_wxWindow_SetClientSizeWH(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxWindow_SetClientRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetClientRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect *arg2 = 0 ;
@@ -26104,7 +26140,7 @@ static PyObject *_wrap_wxWindow_SetClientRect(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetClientRect",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetClientRect",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26125,7 +26161,7 @@ static PyObject *_wrap_wxWindow_SetClientRect(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint result;
@@ -26134,7 +26170,7 @@ static PyObject *_wrap_wxWindow_GetPosition(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26155,7 +26191,7 @@ static PyObject *_wrap_wxWindow_GetPosition(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetPositionTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -26171,7 +26207,7 @@ static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *, PyObject *args, PyO
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetPositionTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetPositionTuple",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26192,7 +26228,7 @@ static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxWindow_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -26201,7 +26237,7 @@ static PyObject *_wrap_wxWindow_GetSize(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26222,7 +26258,7 @@ static PyObject *_wrap_wxWindow_GetSize(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -26238,7 +26274,7 @@ static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *, PyObject *args, PyObjec
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetSizeTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetSizeTuple",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26259,7 +26295,7 @@ static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect result;
@@ -26268,7 +26304,7 @@ static PyObject *_wrap_wxWindow_GetRect(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetRect",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetRect",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26289,7 +26325,7 @@ static PyObject *_wrap_wxWindow_GetRect(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_GetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -26298,7 +26334,7 @@ static PyObject *_wrap_wxWindow_GetClientSize(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetClientSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetClientSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26319,7 +26355,7 @@ static PyObject *_wrap_wxWindow_GetClientSize(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetClientSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -26335,7 +26371,7 @@ static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *, PyObject *args, P
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetClientSizeTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetClientSizeTuple",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26356,7 +26392,7 @@ static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxWindow_GetClientAreaOrigin(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetClientAreaOrigin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint result;
@@ -26365,7 +26401,7 @@ static PyObject *_wrap_wxWindow_GetClientAreaOrigin(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetClientAreaOrigin",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetClientAreaOrigin",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26386,7 +26422,7 @@ static PyObject *_wrap_wxWindow_GetClientAreaOrigin(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_GetClientRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetClientRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect result;
@@ -26395,7 +26431,7 @@ static PyObject *_wrap_wxWindow_GetClientRect(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetClientRect",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetClientRect",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26416,7 +26452,7 @@ static PyObject *_wrap_wxWindow_GetClientRect(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_GetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -26425,7 +26461,7 @@ static PyObject *_wrap_wxWindow_GetBestSize(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetBestSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetBestSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26446,7 +26482,7 @@ static PyObject *_wrap_wxWindow_GetBestSize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_GetBestSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetBestSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -26462,7 +26498,7 @@ static PyObject *_wrap_wxWindow_GetBestSizeTuple(PyObject *, PyObject *args, PyO
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetBestSizeTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetBestSizeTuple",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26483,7 +26519,7 @@ static PyObject *_wrap_wxWindow_GetBestSizeTuple(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxWindow_InvalidateBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_InvalidateBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26491,7 +26527,7 @@ static PyObject *_wrap_wxWindow_InvalidateBestSize(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_InvalidateBestSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_InvalidateBestSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26508,7 +26544,39 @@ static PyObject *_wrap_wxWindow_InvalidateBestSize(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxWindow_GetBestFittingSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_CacheBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxWindow *arg1 = (wxWindow *) 0 ;
+    wxSize *arg2 = 0 ;
+    wxSize temp2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "size", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_CacheBestSize",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = &temp2;
+        if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        ((wxWindow const *)arg1)->CacheBestSize((wxSize const &)*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Window_GetBestFittingSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -26517,7 +26585,7 @@ static PyObject *_wrap_wxWindow_GetBestFittingSize(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetBestFittingSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetBestFittingSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26538,7 +26606,7 @@ static PyObject *_wrap_wxWindow_GetBestFittingSize(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxWindow_GetAdjustedBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetAdjustedBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -26547,7 +26615,7 @@ static PyObject *_wrap_wxWindow_GetAdjustedBestSize(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetAdjustedBestSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetAdjustedBestSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26568,7 +26636,7 @@ static PyObject *_wrap_wxWindow_GetAdjustedBestSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_Center(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Center(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxBOTH ;
@@ -26578,7 +26646,7 @@ static PyObject *_wrap_wxWindow_Center(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "direction", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxWindow_Center",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Center",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -26601,7 +26669,7 @@ static PyObject *_wrap_wxWindow_Center(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxWindow_CenterOnScreen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_CenterOnScreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxBOTH ;
@@ -26611,7 +26679,7 @@ static PyObject *_wrap_wxWindow_CenterOnScreen(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "dir", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxWindow_CenterOnScreen",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_CenterOnScreen",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -26634,7 +26702,7 @@ static PyObject *_wrap_wxWindow_CenterOnScreen(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_CenterOnParent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_CenterOnParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxBOTH ;
@@ -26644,7 +26712,7 @@ static PyObject *_wrap_wxWindow_CenterOnParent(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "dir", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxWindow_CenterOnParent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_CenterOnParent",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -26667,7 +26735,7 @@ static PyObject *_wrap_wxWindow_CenterOnParent(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_Fit(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Fit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26675,7 +26743,7 @@ static PyObject *_wrap_wxWindow_Fit(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_Fit",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Fit",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26692,7 +26760,7 @@ static PyObject *_wrap_wxWindow_Fit(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxWindow_FitInside(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_FitInside(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26700,7 +26768,7 @@ static PyObject *_wrap_wxWindow_FitInside(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_FitInside",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_FitInside",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26717,7 +26785,7 @@ static PyObject *_wrap_wxWindow_FitInside(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetSizeHints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -26737,7 +26805,7 @@ static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "minW",(char *) "minH",(char *) "maxW",(char *) "maxH",(char *) "incW",(char *) "incH", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:wxWindow_SetSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Window_SetSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26786,7 +26854,7 @@ static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_SetSizeHintsSz(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetSizeHintsSz(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -26805,7 +26873,7 @@ static PyObject *_wrap_wxWindow_SetSizeHintsSz(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "minSize",(char *) "maxSize",(char *) "incSize", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:wxWindow_SetSizeHintsSz",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Window_SetSizeHintsSz",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26838,7 +26906,7 @@ static PyObject *_wrap_wxWindow_SetSizeHintsSz(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_SetVirtualSizeHints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -26854,7 +26922,7 @@ static PyObject *_wrap_wxWindow_SetVirtualSizeHints(PyObject *, PyObject *args,
         (char *) "self",(char *) "minW",(char *) "minH",(char *) "maxW",(char *) "maxH", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:wxWindow_SetVirtualSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Window_SetVirtualSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26891,7 +26959,7 @@ static PyObject *_wrap_wxWindow_SetVirtualSizeHints(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_SetVirtualSizeHintsSz(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetVirtualSizeHintsSz(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -26906,7 +26974,7 @@ static PyObject *_wrap_wxWindow_SetVirtualSizeHintsSz(PyObject *, PyObject *args
         (char *) "self",(char *) "minSize",(char *) "maxSize", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxWindow_SetVirtualSizeHintsSz",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetVirtualSizeHintsSz",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26933,7 +27001,7 @@ static PyObject *_wrap_wxWindow_SetVirtualSizeHintsSz(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxWindow_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -26942,7 +27010,7 @@ static PyObject *_wrap_wxWindow_GetMaxSize(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetMaxSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26963,7 +27031,7 @@ static PyObject *_wrap_wxWindow_GetMaxSize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_GetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -26972,7 +27040,7 @@ static PyObject *_wrap_wxWindow_GetMinSize(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetMinSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26993,7 +27061,7 @@ static PyObject *_wrap_wxWindow_GetMinSize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_SetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -27004,7 +27072,7 @@ static PyObject *_wrap_wxWindow_SetMinSize(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "minSize", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetMinSize",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetMinSize",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27025,7 +27093,7 @@ static PyObject *_wrap_wxWindow_SetMinSize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_SetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -27036,7 +27104,7 @@ static PyObject *_wrap_wxWindow_SetMaxSize(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "maxSize", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetMaxSize",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetMaxSize",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27057,7 +27125,7 @@ static PyObject *_wrap_wxWindow_SetMaxSize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_GetMinWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetMinWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -27066,7 +27134,7 @@ static PyObject *_wrap_wxWindow_GetMinWidth(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetMinWidth",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinWidth",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27085,7 +27153,7 @@ static PyObject *_wrap_wxWindow_GetMinWidth(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_GetMinHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetMinHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -27094,7 +27162,7 @@ static PyObject *_wrap_wxWindow_GetMinHeight(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetMinHeight",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinHeight",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27113,7 +27181,7 @@ static PyObject *_wrap_wxWindow_GetMinHeight(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_GetMaxWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetMaxWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -27122,7 +27190,7 @@ static PyObject *_wrap_wxWindow_GetMaxWidth(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetMaxWidth",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxWidth",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27141,7 +27209,7 @@ static PyObject *_wrap_wxWindow_GetMaxWidth(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_GetMaxHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetMaxHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -27150,7 +27218,7 @@ static PyObject *_wrap_wxWindow_GetMaxHeight(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetMaxHeight",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxHeight",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27169,7 +27237,7 @@ static PyObject *_wrap_wxWindow_GetMaxHeight(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_SetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -27180,7 +27248,7 @@ static PyObject *_wrap_wxWindow_SetVirtualSize(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "size", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetVirtualSize",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetVirtualSize",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27201,7 +27269,7 @@ static PyObject *_wrap_wxWindow_SetVirtualSize(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_SetVirtualSizeWH(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetVirtualSizeWH(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -27213,7 +27281,7 @@ static PyObject *_wrap_wxWindow_SetVirtualSizeWH(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "w",(char *) "h", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxWindow_SetVirtualSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetVirtualSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27238,7 +27306,7 @@ static PyObject *_wrap_wxWindow_SetVirtualSizeWH(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxWindow_GetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -27247,7 +27315,7 @@ static PyObject *_wrap_wxWindow_GetVirtualSize(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetVirtualSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetVirtualSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27268,7 +27336,7 @@ static PyObject *_wrap_wxWindow_GetVirtualSize(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_GetVirtualSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetVirtualSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -27284,7 +27352,7 @@ static PyObject *_wrap_wxWindow_GetVirtualSizeTuple(PyObject *, PyObject *args,
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetVirtualSizeTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetVirtualSizeTuple",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27305,7 +27373,7 @@ static PyObject *_wrap_wxWindow_GetVirtualSizeTuple(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_GetBestVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetBestVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -27314,7 +27382,7 @@ static PyObject *_wrap_wxWindow_GetBestVirtualSize(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetBestVirtualSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetBestVirtualSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27335,7 +27403,7 @@ static PyObject *_wrap_wxWindow_GetBestVirtualSize(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxWindow_Show(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Show(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 = (bool) true ;
@@ -27346,7 +27414,7 @@ static PyObject *_wrap_wxWindow_Show(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "show", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxWindow_Show",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Show",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -27371,7 +27439,7 @@ static PyObject *_wrap_wxWindow_Show(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxWindow_Hide(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Hide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -27380,7 +27448,7 @@ static PyObject *_wrap_wxWindow_Hide(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_Hide",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Hide",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27399,7 +27467,7 @@ static PyObject *_wrap_wxWindow_Hide(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxWindow_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 = (bool) true ;
@@ -27410,7 +27478,7 @@ static PyObject *_wrap_wxWindow_Enable(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "enable", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxWindow_Enable",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Enable",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -27435,7 +27503,7 @@ static PyObject *_wrap_wxWindow_Enable(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxWindow_Disable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Disable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -27444,7 +27512,7 @@ static PyObject *_wrap_wxWindow_Disable(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_Disable",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Disable",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27463,7 +27531,7 @@ static PyObject *_wrap_wxWindow_Disable(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_IsShown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsShown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -27472,7 +27540,7 @@ static PyObject *_wrap_wxWindow_IsShown(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_IsShown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_IsShown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27491,7 +27559,7 @@ static PyObject *_wrap_wxWindow_IsShown(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -27500,7 +27568,7 @@ static PyObject *_wrap_wxWindow_IsEnabled(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_IsEnabled",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_IsEnabled",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27519,7 +27587,7 @@ static PyObject *_wrap_wxWindow_IsEnabled(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_SetWindowStyleFlag(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetWindowStyleFlag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long arg2 ;
@@ -27529,7 +27597,7 @@ static PyObject *_wrap_wxWindow_SetWindowStyleFlag(PyObject *, PyObject *args, P
         (char *) "self",(char *) "style", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetWindowStyleFlag",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetWindowStyleFlag",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27550,7 +27618,7 @@ static PyObject *_wrap_wxWindow_SetWindowStyleFlag(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxWindow_GetWindowStyleFlag(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetWindowStyleFlag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long result;
@@ -27559,7 +27627,7 @@ static PyObject *_wrap_wxWindow_GetWindowStyleFlag(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetWindowStyleFlag",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetWindowStyleFlag",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27578,7 +27646,7 @@ static PyObject *_wrap_wxWindow_GetWindowStyleFlag(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxWindow_HasFlag(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_HasFlag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -27589,7 +27657,7 @@ static PyObject *_wrap_wxWindow_HasFlag(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "flag", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_HasFlag",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_HasFlag",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27612,7 +27680,7 @@ static PyObject *_wrap_wxWindow_HasFlag(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_IsRetained(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsRetained(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -27621,7 +27689,7 @@ static PyObject *_wrap_wxWindow_IsRetained(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_IsRetained",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_IsRetained",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27640,7 +27708,7 @@ static PyObject *_wrap_wxWindow_IsRetained(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_SetExtraStyle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetExtraStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long arg2 ;
@@ -27650,7 +27718,7 @@ static PyObject *_wrap_wxWindow_SetExtraStyle(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "exStyle", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetExtraStyle",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetExtraStyle",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27671,7 +27739,7 @@ static PyObject *_wrap_wxWindow_SetExtraStyle(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_GetExtraStyle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetExtraStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long result;
@@ -27680,7 +27748,7 @@ static PyObject *_wrap_wxWindow_GetExtraStyle(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetExtraStyle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetExtraStyle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27699,7 +27767,7 @@ static PyObject *_wrap_wxWindow_GetExtraStyle(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_MakeModal(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_MakeModal(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 = (bool) true ;
@@ -27709,7 +27777,7 @@ static PyObject *_wrap_wxWindow_MakeModal(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "modal", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxWindow_MakeModal",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_MakeModal",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -27732,7 +27800,7 @@ static PyObject *_wrap_wxWindow_MakeModal(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_SetThemeEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetThemeEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 ;
@@ -27742,7 +27810,7 @@ static PyObject *_wrap_wxWindow_SetThemeEnabled(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "enableTheme", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetThemeEnabled",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetThemeEnabled",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27763,7 +27831,7 @@ static PyObject *_wrap_wxWindow_SetThemeEnabled(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxWindow_GetThemeEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetThemeEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -27772,7 +27840,7 @@ static PyObject *_wrap_wxWindow_GetThemeEnabled(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetThemeEnabled",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetThemeEnabled",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27791,7 +27859,7 @@ static PyObject *_wrap_wxWindow_GetThemeEnabled(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxWindow_SetFocus(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27799,7 +27867,7 @@ static PyObject *_wrap_wxWindow_SetFocus(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_SetFocus",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_SetFocus",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27816,7 +27884,7 @@ static PyObject *_wrap_wxWindow_SetFocus(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_SetFocusFromKbd(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetFocusFromKbd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27824,7 +27892,7 @@ static PyObject *_wrap_wxWindow_SetFocusFromKbd(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_SetFocusFromKbd",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_SetFocusFromKbd",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27841,14 +27909,14 @@ static PyObject *_wrap_wxWindow_SetFocusFromKbd(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxWindow_FindFocus(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_FindFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxWindow_FindFocus",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":Window_FindFocus",kwnames)) goto fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27866,7 +27934,7 @@ static PyObject *_wrap_wxWindow_FindFocus(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -27875,7 +27943,7 @@ static PyObject *_wrap_wxWindow_AcceptsFocus(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_AcceptsFocus",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_AcceptsFocus",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27894,7 +27962,7 @@ static PyObject *_wrap_wxWindow_AcceptsFocus(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -27903,7 +27971,7 @@ static PyObject *_wrap_wxWindow_AcceptsFocusFromKeyboard(PyObject *, PyObject *a
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27922,7 +27990,7 @@ static PyObject *_wrap_wxWindow_AcceptsFocusFromKeyboard(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxWindow_GetDefaultItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetDefaultItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *result;
@@ -27931,7 +27999,7 @@ static PyObject *_wrap_wxWindow_GetDefaultItem(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetDefaultItem",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetDefaultItem",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27950,7 +28018,7 @@ static PyObject *_wrap_wxWindow_GetDefaultItem(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_SetDefaultItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetDefaultItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -27961,7 +28029,7 @@ static PyObject *_wrap_wxWindow_SetDefaultItem(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "child", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetDefaultItem",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultItem",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -27982,7 +28050,7 @@ static PyObject *_wrap_wxWindow_SetDefaultItem(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_SetTmpDefaultItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetTmpDefaultItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -27992,7 +28060,7 @@ static PyObject *_wrap_wxWindow_SetTmpDefaultItem(PyObject *, PyObject *args, Py
         (char *) "self",(char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetTmpDefaultItem",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetTmpDefaultItem",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -28011,7 +28079,7 @@ static PyObject *_wrap_wxWindow_SetTmpDefaultItem(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxWindow_Navigate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Navigate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxNavigationKeyEvent::IsForward ;
@@ -28022,7 +28090,7 @@ static PyObject *_wrap_wxWindow_Navigate(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "flags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxWindow_Navigate",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Navigate",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -28047,7 +28115,7 @@ static PyObject *_wrap_wxWindow_Navigate(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_MoveAfterInTabOrder(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_MoveAfterInTabOrder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -28057,7 +28125,7 @@ static PyObject *_wrap_wxWindow_MoveAfterInTabOrder(PyObject *, PyObject *args,
         (char *) "self",(char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_MoveAfterInTabOrder",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_MoveAfterInTabOrder",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -28076,7 +28144,7 @@ static PyObject *_wrap_wxWindow_MoveAfterInTabOrder(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_MoveBeforeInTabOrder(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_MoveBeforeInTabOrder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -28086,7 +28154,7 @@ static PyObject *_wrap_wxWindow_MoveBeforeInTabOrder(PyObject *, PyObject *args,
         (char *) "self",(char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_MoveBeforeInTabOrder",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_MoveBeforeInTabOrder",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -28105,7 +28173,7 @@ static PyObject *_wrap_wxWindow_MoveBeforeInTabOrder(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_GetChildren(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject *result;
@@ -28114,7 +28182,7 @@ static PyObject *_wrap_wxWindow_GetChildren(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetChildren",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetChildren",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28131,7 +28199,7 @@ static PyObject *_wrap_wxWindow_GetChildren(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_GetParent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *result;
@@ -28140,7 +28208,7 @@ static PyObject *_wrap_wxWindow_GetParent(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetParent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetParent",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28159,7 +28227,7 @@ static PyObject *_wrap_wxWindow_GetParent(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_GetGrandParent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetGrandParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *result;
@@ -28168,7 +28236,7 @@ static PyObject *_wrap_wxWindow_GetGrandParent(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetGrandParent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetGrandParent",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28187,7 +28255,7 @@ static PyObject *_wrap_wxWindow_GetGrandParent(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_IsTopLevel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsTopLevel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -28196,7 +28264,7 @@ static PyObject *_wrap_wxWindow_IsTopLevel(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_IsTopLevel",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_IsTopLevel",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28215,7 +28283,7 @@ static PyObject *_wrap_wxWindow_IsTopLevel(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_Reparent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Reparent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -28226,7 +28294,7 @@ static PyObject *_wrap_wxWindow_Reparent(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "newParent", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_Reparent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_Reparent",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -28247,7 +28315,7 @@ static PyObject *_wrap_wxWindow_Reparent(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -28257,7 +28325,7 @@ static PyObject *_wrap_wxWindow_AddChild(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "child", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_AddChild",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_AddChild",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -28276,7 +28344,7 @@ static PyObject *_wrap_wxWindow_AddChild(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -28286,7 +28354,7 @@ static PyObject *_wrap_wxWindow_RemoveChild(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "child", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_RemoveChild",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_RemoveChild",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -28305,7 +28373,7 @@ static PyObject *_wrap_wxWindow_RemoveChild(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_FindWindowById(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_FindWindowById(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long arg2 ;
@@ -28316,7 +28384,7 @@ static PyObject *_wrap_wxWindow_FindWindowById(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "winid", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_FindWindowById",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_FindWindowById",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28339,7 +28407,7 @@ static PyObject *_wrap_wxWindow_FindWindowById(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_FindWindowByName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_FindWindowByName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -28351,7 +28419,7 @@ static PyObject *_wrap_wxWindow_FindWindowByName(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_FindWindowByName",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_FindWindowByName",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28383,7 +28451,7 @@ static PyObject *_wrap_wxWindow_FindWindowByName(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxWindow_GetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxEvtHandler *result;
@@ -28392,7 +28460,7 @@ static PyObject *_wrap_wxWindow_GetEventHandler(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetEventHandler",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetEventHandler",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28411,7 +28479,7 @@ static PyObject *_wrap_wxWindow_GetEventHandler(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxWindow_SetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) 0 ;
@@ -28421,7 +28489,7 @@ static PyObject *_wrap_wxWindow_SetEventHandler(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "handler", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetEventHandler",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetEventHandler",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
@@ -28440,7 +28508,7 @@ static PyObject *_wrap_wxWindow_SetEventHandler(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxWindow_PushEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PushEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) 0 ;
@@ -28450,7 +28518,7 @@ static PyObject *_wrap_wxWindow_PushEventHandler(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "handler", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_PushEventHandler",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_PushEventHandler",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
@@ -28469,7 +28537,7 @@ static PyObject *_wrap_wxWindow_PushEventHandler(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxWindow_PopEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PopEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 = (bool) false ;
@@ -28480,7 +28548,7 @@ static PyObject *_wrap_wxWindow_PopEventHandler(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "deleteHandler", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxWindow_PopEventHandler",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_PopEventHandler",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -28505,7 +28573,7 @@ static PyObject *_wrap_wxWindow_PopEventHandler(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxWindow_RemoveEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_RemoveEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) 0 ;
@@ -28516,7 +28584,7 @@ static PyObject *_wrap_wxWindow_RemoveEventHandler(PyObject *, PyObject *args, P
         (char *) "self",(char *) "handler", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_RemoveEventHandler",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_RemoveEventHandler",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
@@ -28537,7 +28605,7 @@ static PyObject *_wrap_wxWindow_RemoveEventHandler(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxWindow_SetValidator(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetValidator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxValidator *arg2 = 0 ;
@@ -28547,7 +28615,7 @@ static PyObject *_wrap_wxWindow_SetValidator(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "validator", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetValidator",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetValidator",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28572,7 +28640,7 @@ static PyObject *_wrap_wxWindow_SetValidator(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_GetValidator(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetValidator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxValidator *result;
@@ -28581,7 +28649,7 @@ static PyObject *_wrap_wxWindow_GetValidator(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetValidator",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetValidator",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28600,7 +28668,7 @@ static PyObject *_wrap_wxWindow_GetValidator(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -28609,7 +28677,7 @@ static PyObject *_wrap_wxWindow_Validate(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_Validate",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Validate",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28628,7 +28696,7 @@ static PyObject *_wrap_wxWindow_Validate(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -28637,7 +28705,7 @@ static PyObject *_wrap_wxWindow_TransferDataToWindow(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_TransferDataToWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_TransferDataToWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28656,7 +28724,7 @@ static PyObject *_wrap_wxWindow_TransferDataToWindow(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -28665,7 +28733,7 @@ static PyObject *_wrap_wxWindow_TransferDataFromWindow(PyObject *, PyObject *arg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_TransferDataFromWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_TransferDataFromWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28684,7 +28752,7 @@ static PyObject *_wrap_wxWindow_TransferDataFromWindow(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxWindow_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -28692,7 +28760,7 @@ static PyObject *_wrap_wxWindow_InitDialog(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_InitDialog",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_InitDialog",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28709,7 +28777,7 @@ static PyObject *_wrap_wxWindow_InitDialog(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetAcceleratorTable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxAcceleratorTable *arg2 = 0 ;
@@ -28719,7 +28787,7 @@ static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *, PyObject *args,
         (char *) "self",(char *) "accel", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetAcceleratorTable",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetAcceleratorTable",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28744,7 +28812,7 @@ static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_GetAcceleratorTable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetAcceleratorTable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxAcceleratorTable *result;
@@ -28753,7 +28821,7 @@ static PyObject *_wrap_wxWindow_GetAcceleratorTable(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetAcceleratorTable",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetAcceleratorTable",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28770,7 +28838,7 @@ static PyObject *_wrap_wxWindow_GetAcceleratorTable(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_RegisterHotKey(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_RegisterHotKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -28785,7 +28853,7 @@ static PyObject *_wrap_wxWindow_RegisterHotKey(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "hotkeyId",(char *) "modifiers",(char *) "keycode", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxWindow_RegisterHotKey",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Window_RegisterHotKey",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28816,7 +28884,7 @@ static PyObject *_wrap_wxWindow_RegisterHotKey(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_UnregisterHotKey(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_UnregisterHotKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -28827,7 +28895,7 @@ static PyObject *_wrap_wxWindow_UnregisterHotKey(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "hotkeyId", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_UnregisterHotKey",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_UnregisterHotKey",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28850,7 +28918,7 @@ static PyObject *_wrap_wxWindow_UnregisterHotKey(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxWindow_ConvertDialogPointToPixels(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ConvertDialogPointToPixels(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -28862,7 +28930,7 @@ static PyObject *_wrap_wxWindow_ConvertDialogPointToPixels(PyObject *, PyObject
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_ConvertDialogPointToPixels",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ConvertDialogPointToPixels",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28887,7 +28955,7 @@ static PyObject *_wrap_wxWindow_ConvertDialogPointToPixels(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_ConvertDialogSizeToPixels(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ConvertDialogSizeToPixels(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -28899,7 +28967,7 @@ static PyObject *_wrap_wxWindow_ConvertDialogSizeToPixels(PyObject *, PyObject *
         (char *) "self",(char *) "sz", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_ConvertDialogSizeToPixels",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ConvertDialogSizeToPixels",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28924,7 +28992,7 @@ static PyObject *_wrap_wxWindow_ConvertDialogSizeToPixels(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_DLG_PNT(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_DLG_PNT(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -28936,7 +29004,7 @@ static PyObject *_wrap_wxWindow_DLG_PNT(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_DLG_PNT",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_DLG_PNT",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28961,7 +29029,7 @@ static PyObject *_wrap_wxWindow_DLG_PNT(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_DLG_SZE(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_DLG_SZE(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -28973,7 +29041,7 @@ static PyObject *_wrap_wxWindow_DLG_SZE(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "sz", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_DLG_SZE",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_DLG_SZE",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -28998,7 +29066,7 @@ static PyObject *_wrap_wxWindow_DLG_SZE(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_ConvertPixelPointToDialog(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ConvertPixelPointToDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -29010,7 +29078,7 @@ static PyObject *_wrap_wxWindow_ConvertPixelPointToDialog(PyObject *, PyObject *
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_ConvertPixelPointToDialog",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ConvertPixelPointToDialog",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29035,7 +29103,7 @@ static PyObject *_wrap_wxWindow_ConvertPixelPointToDialog(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ConvertPixelSizeToDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -29047,7 +29115,7 @@ static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *, PyObject *a
         (char *) "self",(char *) "sz", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_ConvertPixelSizeToDialog",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ConvertPixelSizeToDialog",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29072,7 +29140,7 @@ static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxWindow_WarpPointer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_WarpPointer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -29084,7 +29152,7 @@ static PyObject *_wrap_wxWindow_WarpPointer(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxWindow_WarpPointer",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_WarpPointer",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29109,7 +29177,7 @@ static PyObject *_wrap_wxWindow_WarpPointer(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_CaptureMouse(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_CaptureMouse(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -29117,7 +29185,7 @@ static PyObject *_wrap_wxWindow_CaptureMouse(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_CaptureMouse",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_CaptureMouse",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29134,7 +29202,7 @@ static PyObject *_wrap_wxWindow_CaptureMouse(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_ReleaseMouse(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ReleaseMouse(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -29142,7 +29210,7 @@ static PyObject *_wrap_wxWindow_ReleaseMouse(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_ReleaseMouse",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_ReleaseMouse",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29159,14 +29227,14 @@ static PyObject *_wrap_wxWindow_ReleaseMouse(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_GetCapture(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetCapture(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxWindow_GetCapture",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":Window_GetCapture",kwnames)) goto fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29184,7 +29252,7 @@ static PyObject *_wrap_wxWindow_GetCapture(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_HasCapture(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_HasCapture(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -29193,7 +29261,7 @@ static PyObject *_wrap_wxWindow_HasCapture(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_HasCapture",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_HasCapture",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29212,7 +29280,7 @@ static PyObject *_wrap_wxWindow_HasCapture(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_Refresh(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Refresh(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 = (bool) true ;
@@ -29224,7 +29292,7 @@ static PyObject *_wrap_wxWindow_Refresh(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "eraseBackground",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:wxWindow_Refresh",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Window_Refresh",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -29251,7 +29319,7 @@ static PyObject *_wrap_wxWindow_Refresh(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_RefreshRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_RefreshRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect *arg2 = 0 ;
@@ -29264,7 +29332,7 @@ static PyObject *_wrap_wxWindow_RefreshRect(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "rect",(char *) "eraseBackground", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxWindow_RefreshRect",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_RefreshRect",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29291,7 +29359,7 @@ static PyObject *_wrap_wxWindow_RefreshRect(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_Update(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Update(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -29299,7 +29367,7 @@ static PyObject *_wrap_wxWindow_Update(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_Update",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Update",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29316,7 +29384,7 @@ static PyObject *_wrap_wxWindow_Update(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxWindow_ClearBackground(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ClearBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -29324,7 +29392,7 @@ static PyObject *_wrap_wxWindow_ClearBackground(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_ClearBackground",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_ClearBackground",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29341,7 +29409,7 @@ static PyObject *_wrap_wxWindow_ClearBackground(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxWindow_Freeze(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Freeze(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -29349,7 +29417,7 @@ static PyObject *_wrap_wxWindow_Freeze(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_Freeze",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Freeze",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29366,7 +29434,7 @@ static PyObject *_wrap_wxWindow_Freeze(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxWindow_Thaw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Thaw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -29374,7 +29442,7 @@ static PyObject *_wrap_wxWindow_Thaw(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_Thaw",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Thaw",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29391,7 +29459,7 @@ static PyObject *_wrap_wxWindow_Thaw(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxWindow_PrepareDC(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PrepareDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29401,7 +29469,7 @@ static PyObject *_wrap_wxWindow_PrepareDC(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "dc", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_PrepareDC",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_PrepareDC",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29426,7 +29494,7 @@ static PyObject *_wrap_wxWindow_PrepareDC(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_GetUpdateRegion(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetUpdateRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRegion *result;
@@ -29435,7 +29503,7 @@ static PyObject *_wrap_wxWindow_GetUpdateRegion(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetUpdateRegion",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetUpdateRegion",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29455,7 +29523,7 @@ static PyObject *_wrap_wxWindow_GetUpdateRegion(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxWindow_GetUpdateClientRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetUpdateClientRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect result;
@@ -29464,7 +29532,7 @@ static PyObject *_wrap_wxWindow_GetUpdateClientRect(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetUpdateClientRect",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetUpdateClientRect",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29485,7 +29553,7 @@ static PyObject *_wrap_wxWindow_GetUpdateClientRect(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_IsExposed(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsExposed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -29502,7 +29570,7 @@ static PyObject *_wrap_wxWindow_IsExposed(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:wxWindow_IsExposed",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Window_IsExposed",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29541,7 +29609,7 @@ static PyObject *_wrap_wxWindow_IsExposed(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_IsExposedPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsExposedPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -29553,7 +29621,7 @@ static PyObject *_wrap_wxWindow_IsExposedPoint(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_IsExposedPoint",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_IsExposedPoint",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29576,7 +29644,7 @@ static PyObject *_wrap_wxWindow_IsExposedPoint(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_IsExposedRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsExposedRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect *arg2 = 0 ;
@@ -29588,7 +29656,7 @@ static PyObject *_wrap_wxWindow_IsExposedRect(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_IsExposedRect",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_IsExposedRect",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29611,7 +29679,7 @@ static PyObject *_wrap_wxWindow_IsExposedRect(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxVisualAttributes result;
@@ -29620,7 +29688,7 @@ static PyObject *_wrap_wxWindow_GetDefaultAttributes(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetDefaultAttributes",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetDefaultAttributes",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29641,7 +29709,7 @@ static PyObject *_wrap_wxWindow_GetDefaultAttributes(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -29650,7 +29718,7 @@ static PyObject *_wrap_wxWindow_GetClassDefaultAttributes(PyObject *, PyObject *
         (char *) "variant", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:wxWindow_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Window_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (wxWindowVariant)(SWIG_As_int(obj0)); 
@@ -29676,7 +29744,7 @@ static PyObject *_wrap_wxWindow_GetClassDefaultAttributes(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxColour *arg2 = 0 ;
@@ -29688,7 +29756,7 @@ static PyObject *_wrap_wxWindow_SetBackgroundColour(PyObject *, PyObject *args,
         (char *) "self",(char *) "colour", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetBackgroundColour",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetBackgroundColour",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29711,7 +29779,7 @@ static PyObject *_wrap_wxWindow_SetBackgroundColour(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_SetOwnBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetOwnBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxColour *arg2 = 0 ;
@@ -29722,7 +29790,7 @@ static PyObject *_wrap_wxWindow_SetOwnBackgroundColour(PyObject *, PyObject *arg
         (char *) "self",(char *) "colour", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetOwnBackgroundColour",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetOwnBackgroundColour",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29743,7 +29811,7 @@ static PyObject *_wrap_wxWindow_SetOwnBackgroundColour(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxWindow_SetForegroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetForegroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxColour *arg2 = 0 ;
@@ -29755,7 +29823,7 @@ static PyObject *_wrap_wxWindow_SetForegroundColour(PyObject *, PyObject *args,
         (char *) "self",(char *) "colour", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetForegroundColour",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetForegroundColour",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29778,7 +29846,7 @@ static PyObject *_wrap_wxWindow_SetForegroundColour(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_SetOwnForegroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetOwnForegroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxColour *arg2 = 0 ;
@@ -29789,7 +29857,7 @@ static PyObject *_wrap_wxWindow_SetOwnForegroundColour(PyObject *, PyObject *arg
         (char *) "self",(char *) "colour", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetOwnForegroundColour",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetOwnForegroundColour",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29810,7 +29878,7 @@ static PyObject *_wrap_wxWindow_SetOwnForegroundColour(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxWindow_GetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxColour result;
@@ -29819,7 +29887,7 @@ static PyObject *_wrap_wxWindow_GetBackgroundColour(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetBackgroundColour",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetBackgroundColour",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29840,7 +29908,7 @@ static PyObject *_wrap_wxWindow_GetBackgroundColour(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_GetForegroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetForegroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxColour result;
@@ -29849,7 +29917,7 @@ static PyObject *_wrap_wxWindow_GetForegroundColour(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetForegroundColour",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetForegroundColour",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29870,7 +29938,7 @@ static PyObject *_wrap_wxWindow_GetForegroundColour(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxWindow_InheritsBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_InheritsBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -29879,7 +29947,7 @@ static PyObject *_wrap_wxWindow_InheritsBackgroundColour(PyObject *, PyObject *a
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_InheritsBackgroundColour",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_InheritsBackgroundColour",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29898,7 +29966,7 @@ static PyObject *_wrap_wxWindow_InheritsBackgroundColour(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxWindow_UseBgCol(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_UseBgCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -29907,7 +29975,7 @@ static PyObject *_wrap_wxWindow_UseBgCol(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_UseBgCol",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_UseBgCol",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29926,7 +29994,7 @@ static PyObject *_wrap_wxWindow_UseBgCol(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_SetBackgroundStyle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetBackgroundStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxBackgroundStyle arg2 ;
@@ -29937,7 +30005,7 @@ static PyObject *_wrap_wxWindow_SetBackgroundStyle(PyObject *, PyObject *args, P
         (char *) "self",(char *) "style", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetBackgroundStyle",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetBackgroundStyle",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29960,7 +30028,7 @@ static PyObject *_wrap_wxWindow_SetBackgroundStyle(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxWindow_GetBackgroundStyle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetBackgroundStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxBackgroundStyle result;
@@ -29969,7 +30037,7 @@ static PyObject *_wrap_wxWindow_GetBackgroundStyle(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetBackgroundStyle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetBackgroundStyle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -29986,7 +30054,7 @@ static PyObject *_wrap_wxWindow_GetBackgroundStyle(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxWindow_HasTransparentBackground(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_HasTransparentBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -29995,7 +30063,7 @@ static PyObject *_wrap_wxWindow_HasTransparentBackground(PyObject *, PyObject *a
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_HasTransparentBackground",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_HasTransparentBackground",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30014,7 +30082,7 @@ static PyObject *_wrap_wxWindow_HasTransparentBackground(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxWindow_SetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxCursor *arg2 = 0 ;
@@ -30025,7 +30093,7 @@ static PyObject *_wrap_wxWindow_SetCursor(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "cursor", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetCursor",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetCursor",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30052,7 +30120,7 @@ static PyObject *_wrap_wxWindow_SetCursor(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_GetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxCursor result;
@@ -30061,7 +30129,7 @@ static PyObject *_wrap_wxWindow_GetCursor(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetCursor",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetCursor",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30082,7 +30150,7 @@ static PyObject *_wrap_wxWindow_GetCursor(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxFont *arg2 = 0 ;
@@ -30093,7 +30161,7 @@ static PyObject *_wrap_wxWindow_SetFont(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "font", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetFont",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetFont",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30120,7 +30188,7 @@ static PyObject *_wrap_wxWindow_SetFont(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_SetOwnFont(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetOwnFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxFont *arg2 = 0 ;
@@ -30130,7 +30198,7 @@ static PyObject *_wrap_wxWindow_SetOwnFont(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "font", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetOwnFont",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetOwnFont",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30155,7 +30223,7 @@ static PyObject *_wrap_wxWindow_SetOwnFont(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxFont result;
@@ -30164,7 +30232,7 @@ static PyObject *_wrap_wxWindow_GetFont(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetFont",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetFont",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30185,7 +30253,7 @@ static PyObject *_wrap_wxWindow_GetFont(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_SetCaret(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetCaret(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxCaret *arg2 = (wxCaret *) 0 ;
@@ -30195,7 +30263,7 @@ static PyObject *_wrap_wxWindow_SetCaret(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "caret", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetCaret",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetCaret",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxCaret, SWIG_POINTER_EXCEPTION | 0);
@@ -30214,7 +30282,7 @@ static PyObject *_wrap_wxWindow_SetCaret(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_GetCaret(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetCaret(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxCaret *result;
@@ -30223,7 +30291,7 @@ static PyObject *_wrap_wxWindow_GetCaret(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetCaret",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetCaret",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30240,7 +30308,7 @@ static PyObject *_wrap_wxWindow_GetCaret(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_GetCharHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetCharHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -30249,7 +30317,7 @@ static PyObject *_wrap_wxWindow_GetCharHeight(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetCharHeight",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetCharHeight",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30268,7 +30336,7 @@ static PyObject *_wrap_wxWindow_GetCharHeight(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_GetCharWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetCharWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -30277,7 +30345,7 @@ static PyObject *_wrap_wxWindow_GetCharWidth(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetCharWidth",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetCharWidth",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30296,7 +30364,7 @@ static PyObject *_wrap_wxWindow_GetCharWidth(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetTextExtent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -30315,7 +30383,7 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *, PyObject *args, PyObje
     
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
     arg4 = &temp4; res4 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_GetTextExtent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetTextExtent",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30349,7 +30417,7 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetFullTextExtent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -30378,7 +30446,7 @@ static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *, PyObject *args, Py
     arg4 = &temp4; res4 = SWIG_NEWOBJ;
     arg5 = &temp5; res5 = SWIG_NEWOBJ;
     arg6 = &temp6; res6 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxWindow_GetFullTextExtent",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_GetFullTextExtent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30420,7 +30488,7 @@ static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxWindow_ClientToScreenXY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ClientToScreenXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -30436,7 +30504,7 @@ static PyObject *_wrap_wxWindow_ClientToScreenXY(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxWindow_ClientToScreenXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_ClientToScreenXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30473,7 +30541,7 @@ static PyObject *_wrap_wxWindow_ClientToScreenXY(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxWindow_ScreenToClientXY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ScreenToClientXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -30489,7 +30557,7 @@ static PyObject *_wrap_wxWindow_ScreenToClientXY(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxWindow_ScreenToClientXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_ScreenToClientXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30526,7 +30594,7 @@ static PyObject *_wrap_wxWindow_ScreenToClientXY(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ClientToScreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -30538,7 +30606,7 @@ static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_ClientToScreen",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ClientToScreen",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30563,7 +30631,7 @@ static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ScreenToClient(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -30575,7 +30643,7 @@ static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_ScreenToClient",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ScreenToClient",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30600,7 +30668,7 @@ static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_HitTestXY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_HitTestXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -30613,7 +30681,7 @@ static PyObject *_wrap_wxWindow_HitTestXY(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxWindow_HitTestXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_HitTestXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30638,7 +30706,7 @@ static PyObject *_wrap_wxWindow_HitTestXY(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -30650,7 +30718,7 @@ static PyObject *_wrap_wxWindow_HitTest(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_HitTest",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_HitTest",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30671,7 +30739,7 @@ static PyObject *_wrap_wxWindow_HitTest(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxWindow_GetBorder__SWIG_0(PyObject *, PyObject *args) {
+static PyObject *_wrap_Window_GetBorder__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long arg2 ;
@@ -30679,7 +30747,7 @@ static PyObject *_wrap_wxWindow_GetBorder__SWIG_0(PyObject *, PyObject *args) {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OO:wxWindow_GetBorder",&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OO:Window_GetBorder",&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30700,13 +30768,13 @@ static PyObject *_wrap_wxWindow_GetBorder__SWIG_0(PyObject *, PyObject *args) {
 }
 
 
-static PyObject *_wrap_wxWindow_GetBorder__SWIG_1(PyObject *, PyObject *args) {
+static PyObject *_wrap_Window_GetBorder__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxBorder result;
     PyObject * obj0 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"O:wxWindow_GetBorder",&obj0)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"O:Window_GetBorder",&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30723,7 +30791,7 @@ static PyObject *_wrap_wxWindow_GetBorder__SWIG_1(PyObject *, PyObject *args) {
 }
 
 
-static PyObject *_wrap_wxWindow_GetBorder(PyObject *self, PyObject *args) {
+static PyObject *_wrap_Window_GetBorder(PyObject *self, PyObject *args) {
     int argc;
     PyObject *argv[3];
     int ii;
@@ -30744,7 +30812,7 @@ static PyObject *_wrap_wxWindow_GetBorder(PyObject *self, PyObject *args) {
             }
         }
         if (_v) {
-            return _wrap_wxWindow_GetBorder__SWIG_1(self,args);
+            return _wrap_Window_GetBorder__SWIG_1(self,args);
         }
     }
     if (argc == 2) {
@@ -30761,17 +30829,17 @@ static PyObject *_wrap_wxWindow_GetBorder(PyObject *self, PyObject *args) {
         if (_v) {
             _v = SWIG_Check_long(argv[1]);
             if (_v) {
-                return _wrap_wxWindow_GetBorder__SWIG_0(self,args);
+                return _wrap_Window_GetBorder__SWIG_0(self,args);
             }
         }
     }
     
-    PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'wxWindow_GetBorder'");
+    PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'Window_GetBorder'");
     return NULL;
 }
 
 
-static PyObject *_wrap_wxWindow_UpdateWindowUI(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_UpdateWindowUI(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long arg2 = (long) wxUPDATE_UI_NONE ;
@@ -30781,7 +30849,7 @@ static PyObject *_wrap_wxWindow_UpdateWindowUI(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "flags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxWindow_UpdateWindowUI",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_UpdateWindowUI",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -30804,7 +30872,7 @@ static PyObject *_wrap_wxWindow_UpdateWindowUI(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PopupMenuXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -30819,7 +30887,7 @@ static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "menu",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:wxWindow_PopupMenuXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Window_PopupMenuXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
@@ -30852,7 +30920,7 @@ static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_PopupMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PopupMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -30867,7 +30935,7 @@ static PyObject *_wrap_wxWindow_PopupMenu(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "menu",(char *) "pos", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxWindow_PopupMenu",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_PopupMenu",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
@@ -30894,7 +30962,7 @@ static PyObject *_wrap_wxWindow_PopupMenu(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_GetHandle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetHandle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long result;
@@ -30903,7 +30971,7 @@ static PyObject *_wrap_wxWindow_GetHandle(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetHandle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetHandle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30922,7 +30990,7 @@ static PyObject *_wrap_wxWindow_GetHandle(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxWindow_AssociateHandle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_AssociateHandle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long arg2 ;
@@ -30932,7 +31000,7 @@ static PyObject *_wrap_wxWindow_AssociateHandle(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "handle", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_AssociateHandle",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_AssociateHandle",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30953,7 +31021,7 @@ static PyObject *_wrap_wxWindow_AssociateHandle(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxWindow_DissociateHandle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_DissociateHandle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -30961,7 +31029,7 @@ static PyObject *_wrap_wxWindow_DissociateHandle(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_DissociateHandle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_DissociateHandle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -30978,7 +31046,7 @@ static PyObject *_wrap_wxWindow_DissociateHandle(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxWindow_HasScrollbar(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_HasScrollbar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -30989,7 +31057,7 @@ static PyObject *_wrap_wxWindow_HasScrollbar(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "orient", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_HasScrollbar",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_HasScrollbar",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31012,7 +31080,7 @@ static PyObject *_wrap_wxWindow_HasScrollbar(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetScrollbar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -31030,7 +31098,7 @@ static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "orientation",(char *) "position",(char *) "thumbSize",(char *) "range",(char *) "refresh", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:wxWindow_SetScrollbar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Window_SetScrollbar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31069,7 +31137,7 @@ static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_SetScrollPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetScrollPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -31083,7 +31151,7 @@ static PyObject *_wrap_wxWindow_SetScrollPos(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "orientation",(char *) "pos",(char *) "refresh", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:wxWindow_SetScrollPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_SetScrollPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31114,7 +31182,7 @@ static PyObject *_wrap_wxWindow_SetScrollPos(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_GetScrollPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetScrollPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -31125,7 +31193,7 @@ static PyObject *_wrap_wxWindow_GetScrollPos(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "orientation", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_GetScrollPos",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollPos",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31148,7 +31216,7 @@ static PyObject *_wrap_wxWindow_GetScrollPos(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_GetScrollThumb(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetScrollThumb(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -31159,7 +31227,7 @@ static PyObject *_wrap_wxWindow_GetScrollThumb(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "orientation", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_GetScrollThumb",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollThumb",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31182,7 +31250,7 @@ static PyObject *_wrap_wxWindow_GetScrollThumb(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_GetScrollRange(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetScrollRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -31193,7 +31261,7 @@ static PyObject *_wrap_wxWindow_GetScrollRange(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "orientation", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_GetScrollRange",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollRange",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31216,7 +31284,7 @@ static PyObject *_wrap_wxWindow_GetScrollRange(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ScrollWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -31230,7 +31298,7 @@ static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "dx",(char *) "dy",(char *) "rect", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:wxWindow_ScrollWindow",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_ScrollWindow",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31259,7 +31327,7 @@ static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxWindow_ScrollLines(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ScrollLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -31270,7 +31338,7 @@ static PyObject *_wrap_wxWindow_ScrollLines(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "lines", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_ScrollLines",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ScrollLines",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31293,7 +31361,7 @@ static PyObject *_wrap_wxWindow_ScrollLines(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_ScrollPages(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ScrollPages(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -31304,7 +31372,7 @@ static PyObject *_wrap_wxWindow_ScrollPages(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "pages", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_ScrollPages",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ScrollPages",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31327,7 +31395,7 @@ static PyObject *_wrap_wxWindow_ScrollPages(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_LineUp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_LineUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -31336,7 +31404,7 @@ static PyObject *_wrap_wxWindow_LineUp(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_LineUp",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_LineUp",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31355,7 +31423,7 @@ static PyObject *_wrap_wxWindow_LineUp(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxWindow_LineDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_LineDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -31364,7 +31432,7 @@ static PyObject *_wrap_wxWindow_LineDown(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_LineDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_LineDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31383,7 +31451,7 @@ static PyObject *_wrap_wxWindow_LineDown(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_PageUp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PageUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -31392,7 +31460,7 @@ static PyObject *_wrap_wxWindow_PageUp(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_PageUp",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_PageUp",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31411,7 +31479,7 @@ static PyObject *_wrap_wxWindow_PageUp(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxWindow_PageDown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PageDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -31420,7 +31488,7 @@ static PyObject *_wrap_wxWindow_PageDown(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_PageDown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_PageDown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31439,7 +31507,7 @@ static PyObject *_wrap_wxWindow_PageDown(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_SetHelpText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetHelpText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -31450,7 +31518,7 @@ static PyObject *_wrap_wxWindow_SetHelpText(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "text", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetHelpText",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetHelpText",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31480,7 +31548,7 @@ static PyObject *_wrap_wxWindow_SetHelpText(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_SetHelpTextForId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetHelpTextForId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -31491,7 +31559,7 @@ static PyObject *_wrap_wxWindow_SetHelpTextForId(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "text", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetHelpTextForId",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetHelpTextForId",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31521,7 +31589,7 @@ static PyObject *_wrap_wxWindow_SetHelpTextForId(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxWindow_GetHelpText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetHelpText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString result;
@@ -31530,7 +31598,7 @@ static PyObject *_wrap_wxWindow_GetHelpText(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetHelpText",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetHelpText",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31553,7 +31621,7 @@ static PyObject *_wrap_wxWindow_GetHelpText(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_SetToolTipString(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetToolTipString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -31564,7 +31632,7 @@ static PyObject *_wrap_wxWindow_SetToolTipString(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "tip", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetToolTipString",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetToolTipString",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31594,7 +31662,7 @@ static PyObject *_wrap_wxWindow_SetToolTipString(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxWindow_SetToolTip(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetToolTip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxToolTip *arg2 = (wxToolTip *) 0 ;
@@ -31604,7 +31672,7 @@ static PyObject *_wrap_wxWindow_SetToolTip(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "tip", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetToolTip",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetToolTip",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxToolTip, SWIG_POINTER_EXCEPTION | 0);
@@ -31623,7 +31691,7 @@ static PyObject *_wrap_wxWindow_SetToolTip(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_GetToolTip(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetToolTip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxToolTip *result;
@@ -31632,7 +31700,7 @@ static PyObject *_wrap_wxWindow_GetToolTip(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetToolTip",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetToolTip",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31651,7 +31719,7 @@ static PyObject *_wrap_wxWindow_GetToolTip(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_SetDropTarget(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetDropTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPyDropTarget *arg2 = (wxPyDropTarget *) 0 ;
@@ -31661,7 +31729,7 @@ static PyObject *_wrap_wxWindow_SetDropTarget(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "dropTarget", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetDropTarget",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDropTarget",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyDropTarget, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN);
@@ -31680,7 +31748,7 @@ static PyObject *_wrap_wxWindow_SetDropTarget(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_GetDropTarget(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetDropTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPyDropTarget *result;
@@ -31689,7 +31757,7 @@ static PyObject *_wrap_wxWindow_GetDropTarget(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetDropTarget",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetDropTarget",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31706,7 +31774,38 @@ static PyObject *_wrap_wxWindow_GetDropTarget(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_SetConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_DragAcceptFiles(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxWindow *arg1 = (wxWindow *) 0 ;
+    bool arg2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "accept", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_DragAcceptFiles",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (bool)(SWIG_As_bool(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        wxWindow_DragAcceptFiles(arg1,arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Window_SetConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxLayoutConstraints *arg2 = (wxLayoutConstraints *) 0 ;
@@ -31716,7 +31815,7 @@ static PyObject *_wrap_wxWindow_SetConstraints(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "constraints", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetConstraints",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetConstraints",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxLayoutConstraints, SWIG_POINTER_EXCEPTION | 0);
@@ -31735,7 +31834,7 @@ static PyObject *_wrap_wxWindow_SetConstraints(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_GetConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxLayoutConstraints *result;
@@ -31744,7 +31843,7 @@ static PyObject *_wrap_wxWindow_GetConstraints(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetConstraints",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetConstraints",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31761,7 +31860,7 @@ static PyObject *_wrap_wxWindow_GetConstraints(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_SetAutoLayout(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetAutoLayout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 ;
@@ -31771,7 +31870,7 @@ static PyObject *_wrap_wxWindow_SetAutoLayout(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "autoLayout", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetAutoLayout",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetAutoLayout",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31792,7 +31891,7 @@ static PyObject *_wrap_wxWindow_SetAutoLayout(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_GetAutoLayout(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetAutoLayout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -31801,7 +31900,7 @@ static PyObject *_wrap_wxWindow_GetAutoLayout(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetAutoLayout",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetAutoLayout",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31820,7 +31919,7 @@ static PyObject *_wrap_wxWindow_GetAutoLayout(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxWindow_Layout(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Layout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -31829,7 +31928,7 @@ static PyObject *_wrap_wxWindow_Layout(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_Layout",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Layout",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31848,7 +31947,7 @@ static PyObject *_wrap_wxWindow_Layout(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxWindow_SetSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -31860,7 +31959,7 @@ static PyObject *_wrap_wxWindow_SetSizer(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "sizer",(char *) "deleteOld", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxWindow_SetSizer",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetSizer",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
@@ -31885,7 +31984,7 @@ static PyObject *_wrap_wxWindow_SetSizer(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_SetSizerAndFit(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetSizerAndFit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -31897,7 +31996,7 @@ static PyObject *_wrap_wxWindow_SetSizerAndFit(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "sizer",(char *) "deleteOld", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxWindow_SetSizerAndFit",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetSizerAndFit",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
@@ -31922,7 +32021,7 @@ static PyObject *_wrap_wxWindow_SetSizerAndFit(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxWindow_GetSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSizer *result;
@@ -31931,7 +32030,7 @@ static PyObject *_wrap_wxWindow_GetSizer(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetSizer",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetSizer",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31942,7 +32041,7 @@ static PyObject *_wrap_wxWindow_GetSizer(PyObject *, PyObject *args, PyObject *k
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxSizer(result, 0); 
+        resultobj = wxPyMake_wxObject(result, 0); 
     }
     return resultobj;
     fail:
@@ -31950,7 +32049,7 @@ static PyObject *_wrap_wxWindow_GetSizer(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxWindow_SetContainingSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetContainingSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -31960,7 +32059,7 @@ static PyObject *_wrap_wxWindow_SetContainingSizer(PyObject *, PyObject *args, P
         (char *) "self",(char *) "sizer", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_SetContainingSizer",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetContainingSizer",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
@@ -31979,7 +32078,7 @@ static PyObject *_wrap_wxWindow_SetContainingSizer(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxWindow_GetContainingSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetContainingSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSizer *result;
@@ -31988,7 +32087,7 @@ static PyObject *_wrap_wxWindow_GetContainingSizer(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_GetContainingSizer",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetContainingSizer",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -31999,7 +32098,7 @@ static PyObject *_wrap_wxWindow_GetContainingSizer(PyObject *, PyObject *args, P
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxSizer(result, 0); 
+        resultobj = wxPyMake_wxObject(result, 0); 
     }
     return resultobj;
     fail:
@@ -32007,7 +32106,7 @@ static PyObject *_wrap_wxWindow_GetContainingSizer(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxWindow_InheritAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_InheritAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -32015,7 +32114,7 @@ static PyObject *_wrap_wxWindow_InheritAttributes(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_InheritAttributes",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_InheritAttributes",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -32032,7 +32131,7 @@ static PyObject *_wrap_wxWindow_InheritAttributes(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxWindow_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -32041,7 +32140,7 @@ static PyObject *_wrap_wxWindow_ShouldInheritColours(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxWindow_ShouldInheritColours",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_ShouldInheritColours",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -32060,14 +32159,14 @@ static PyObject *_wrap_wxWindow_ShouldInheritColours(PyObject *, PyObject *args,
 }
 
 
-static PyObject * wxWindow_swigregister(PyObject *, PyObject *args) {
+static PyObject * Window_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxFindWindowById(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindWindowById(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     wxWindow *arg2 = (wxWindow *) NULL ;
@@ -32078,7 +32177,7 @@ static PyObject *_wrap_wxFindWindowById(PyObject *, PyObject *args, PyObject *kw
         (char *) "id",(char *) "parent", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxFindWindowById",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:FindWindowById",kwnames,&obj0,&obj1)) goto fail;
     {
         arg1 = (long)(SWIG_As_long(obj0)); 
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -32104,7 +32203,7 @@ static PyObject *_wrap_wxFindWindowById(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxFindWindowByName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindWindowByName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxWindow *arg2 = (wxWindow *) NULL ;
@@ -32116,7 +32215,7 @@ static PyObject *_wrap_wxFindWindowByName(PyObject *, PyObject *args, PyObject *
         (char *) "name",(char *) "parent", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxFindWindowByName",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:FindWindowByName",kwnames,&obj0,&obj1)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
@@ -32151,7 +32250,7 @@ static PyObject *_wrap_wxFindWindowByName(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxFindWindowByLabel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindWindowByLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxWindow *arg2 = (wxWindow *) NULL ;
@@ -32163,7 +32262,7 @@ static PyObject *_wrap_wxFindWindowByLabel(PyObject *, PyObject *args, PyObject
         (char *) "label",(char *) "parent", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxFindWindowByLabel",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:FindWindowByLabel",kwnames,&obj0,&obj1)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
@@ -32198,7 +32297,7 @@ static PyObject *_wrap_wxFindWindowByLabel(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxWindow_FromHWND(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_FromHWND(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     unsigned long arg2 ;
@@ -32209,7 +32308,7 @@ static PyObject *_wrap_wxWindow_FromHWND(PyObject *, PyObject *args, PyObject *k
         (char *) "parent",(char *) "_hWnd", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxWindow_FromHWND",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_FromHWND",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -32232,14 +32331,36 @@ static PyObject *_wrap_wxWindow_FromHWND(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_wxValidator(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetTopLevelWindows(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    PyObject *result;
+    char *kwnames[] = {
+        NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":GetTopLevelWindows",kwnames)) goto fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (PyObject *)GetTopLevelWindows();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = result;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_new_Validator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxValidator",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_Validator",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxValidator *)new wxValidator();
@@ -32254,7 +32375,7 @@ static PyObject *_wrap_new_wxValidator(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxValidator_Clone(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_Clone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *arg1 = (wxValidator *) 0 ;
     wxValidator *result;
@@ -32263,7 +32384,7 @@ static PyObject *_wrap_wxValidator_Clone(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxValidator_Clone",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Validator_Clone",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxValidator, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -32282,7 +32403,7 @@ static PyObject *_wrap_wxValidator_Clone(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxValidator_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *arg1 = (wxValidator *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -32293,7 +32414,7 @@ static PyObject *_wrap_wxValidator_Validate(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "parent", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxValidator_Validate",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Validator_Validate",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxValidator, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -32314,7 +32435,7 @@ static PyObject *_wrap_wxValidator_Validate(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxValidator_TransferToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_TransferToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *arg1 = (wxValidator *) 0 ;
     bool result;
@@ -32323,7 +32444,7 @@ static PyObject *_wrap_wxValidator_TransferToWindow(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxValidator_TransferToWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Validator_TransferToWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxValidator, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -32342,7 +32463,7 @@ static PyObject *_wrap_wxValidator_TransferToWindow(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxValidator_TransferFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_TransferFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *arg1 = (wxValidator *) 0 ;
     bool result;
@@ -32351,7 +32472,7 @@ static PyObject *_wrap_wxValidator_TransferFromWindow(PyObject *, PyObject *args
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxValidator_TransferFromWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Validator_TransferFromWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxValidator, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -32370,7 +32491,7 @@ static PyObject *_wrap_wxValidator_TransferFromWindow(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxValidator_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *arg1 = (wxValidator *) 0 ;
     wxWindow *result;
@@ -32379,7 +32500,7 @@ static PyObject *_wrap_wxValidator_GetWindow(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxValidator_GetWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Validator_GetWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxValidator, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -32398,7 +32519,7 @@ static PyObject *_wrap_wxValidator_GetWindow(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxValidator_SetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_SetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *arg1 = (wxValidator *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -32408,7 +32529,7 @@ static PyObject *_wrap_wxValidator_SetWindow(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "window", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxValidator_SetWindow",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Validator_SetWindow",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxValidator, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -32427,14 +32548,14 @@ static PyObject *_wrap_wxValidator_SetWindow(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxValidator_IsSilent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_IsSilent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxValidator_IsSilent",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":Validator_IsSilent",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)wxValidator::IsSilent();
@@ -32451,7 +32572,7 @@ static PyObject *_wrap_wxValidator_IsSilent(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxValidator_SetBellOnError(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_SetBellOnError(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) true ;
     PyObject * obj0 = 0 ;
@@ -32459,7 +32580,7 @@ static PyObject *_wrap_wxValidator_SetBellOnError(PyObject *, PyObject *args, Py
         (char *) "doIt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:wxValidator_SetBellOnError",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Validator_SetBellOnError",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -32480,21 +32601,21 @@ static PyObject *_wrap_wxValidator_SetBellOnError(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject * wxValidator_swigregister(PyObject *, PyObject *args) {
+static PyObject * Validator_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxValidator, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxPyValidator(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyValidator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyValidator *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxPyValidator",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PyValidator",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyValidator *)new wxPyValidator();
@@ -32509,7 +32630,7 @@ static PyObject *_wrap_new_wxPyValidator(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxPyValidator__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyValidator__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyValidator *arg1 = (wxPyValidator *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -32523,7 +32644,7 @@ static PyObject *_wrap_wxPyValidator__setCallbackInfo(PyObject *, PyObject *args
         (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:wxPyValidator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyValidator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyValidator, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -32548,20 +32669,20 @@ static PyObject *_wrap_wxPyValidator__setCallbackInfo(PyObject *, PyObject *args
 }
 
 
-static PyObject * wxPyValidator_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyValidator_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyValidator, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_wxDefaultValidator_set(PyObject *) {
-    PyErr_SetString(PyExc_TypeError,"Variable wxDefaultValidator is read-only.");
+static int _wrap_DefaultValidator_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable DefaultValidator is read-only.");
     return 1;
 }
 
 
-static PyObject *_wrap_wxDefaultValidator_get(void) {
+static PyObject *_wrap_DefaultValidator_get(void) {
     PyObject *pyobj;
     
     pyobj = SWIG_NewPointerObj((void *)(&wxDefaultValidator), SWIGTYPE_p_wxValidator, 0);
@@ -32569,7 +32690,7 @@ static PyObject *_wrap_wxDefaultValidator_get(void) {
 }
 
 
-static PyObject *_wrap_new_wxMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Menu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -32582,7 +32703,7 @@ static PyObject *_wrap_new_wxMenu(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "title",(char *) "style", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxMenu",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Menu",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = wxString_in_helper(obj0);
@@ -32619,7 +32740,7 @@ static PyObject *_wrap_new_wxMenu(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_wxMenu_Append(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Append(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -32639,7 +32760,7 @@ static PyObject *_wrap_wxMenu_Append(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:wxMenu_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Menu_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -32696,7 +32817,7 @@ static PyObject *_wrap_wxMenu_Append(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxMenu_AppendSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_AppendSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *result;
@@ -32705,7 +32826,7 @@ static PyObject *_wrap_wxMenu_AppendSeparator(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_AppendSeparator",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_AppendSeparator",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -32724,7 +32845,7 @@ static PyObject *_wrap_wxMenu_AppendSeparator(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenu_AppendCheckItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_AppendCheckItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -32742,7 +32863,7 @@ static PyObject *_wrap_wxMenu_AppendCheckItem(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:wxMenu_AppendCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_AppendCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -32793,7 +32914,7 @@ static PyObject *_wrap_wxMenu_AppendCheckItem(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenu_AppendRadioItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_AppendRadioItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -32811,7 +32932,7 @@ static PyObject *_wrap_wxMenu_AppendRadioItem(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:wxMenu_AppendRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_AppendRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -32862,7 +32983,7 @@ static PyObject *_wrap_wxMenu_AppendRadioItem(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenu_AppendMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_AppendMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -32882,7 +33003,7 @@ static PyObject *_wrap_wxMenu_AppendMenu(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:wxMenu_AppendMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_AppendMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -32935,7 +33056,7 @@ static PyObject *_wrap_wxMenu_AppendMenu(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMenu_AppendItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_AppendItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *arg2 = (wxMenuItem *) 0 ;
@@ -32946,7 +33067,7 @@ static PyObject *_wrap_wxMenu_AppendItem(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_AppendItem",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_AppendItem",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
@@ -32967,7 +33088,7 @@ static PyObject *_wrap_wxMenu_AppendItem(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMenu_Break(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Break(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     PyObject * obj0 = 0 ;
@@ -32975,7 +33096,7 @@ static PyObject *_wrap_wxMenu_Break(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_Break",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_Break",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -32992,7 +33113,7 @@ static PyObject *_wrap_wxMenu_Break(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxMenu_InsertItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_InsertItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -33005,7 +33126,7 @@ static PyObject *_wrap_wxMenu_InsertItem(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "pos",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMenu_InsertItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_InsertItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33030,7 +33151,7 @@ static PyObject *_wrap_wxMenu_InsertItem(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMenu_Insert(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Insert(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -33052,7 +33173,7 @@ static PyObject *_wrap_wxMenu_Insert(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:wxMenu_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:Menu_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33113,7 +33234,7 @@ static PyObject *_wrap_wxMenu_Insert(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxMenu_InsertSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_InsertSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -33124,7 +33245,7 @@ static PyObject *_wrap_wxMenu_InsertSeparator(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "pos", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_InsertSeparator",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_InsertSeparator",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33147,7 +33268,7 @@ static PyObject *_wrap_wxMenu_InsertSeparator(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenu_InsertCheckItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_InsertCheckItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -33167,7 +33288,7 @@ static PyObject *_wrap_wxMenu_InsertCheckItem(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:wxMenu_InsertCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_InsertCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33222,7 +33343,7 @@ static PyObject *_wrap_wxMenu_InsertCheckItem(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenu_InsertRadioItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_InsertRadioItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -33242,7 +33363,7 @@ static PyObject *_wrap_wxMenu_InsertRadioItem(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:wxMenu_InsertRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_InsertRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33297,7 +33418,7 @@ static PyObject *_wrap_wxMenu_InsertRadioItem(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenu_InsertMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_InsertMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -33319,7 +33440,7 @@ static PyObject *_wrap_wxMenu_InsertMenu(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:wxMenu_InsertMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Menu_InsertMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33376,7 +33497,7 @@ static PyObject *_wrap_wxMenu_InsertMenu(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMenu_PrependItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_PrependItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *arg2 = (wxMenuItem *) 0 ;
@@ -33387,7 +33508,7 @@ static PyObject *_wrap_wxMenu_PrependItem(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_PrependItem",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_PrependItem",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
@@ -33408,7 +33529,7 @@ static PyObject *_wrap_wxMenu_PrependItem(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenu_Prepend(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Prepend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -33428,7 +33549,7 @@ static PyObject *_wrap_wxMenu_Prepend(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:wxMenu_Prepend",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Menu_Prepend",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33485,7 +33606,7 @@ static PyObject *_wrap_wxMenu_Prepend(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxMenu_PrependSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_PrependSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *result;
@@ -33494,7 +33615,7 @@ static PyObject *_wrap_wxMenu_PrependSeparator(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_PrependSeparator",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_PrependSeparator",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33513,7 +33634,7 @@ static PyObject *_wrap_wxMenu_PrependSeparator(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxMenu_PrependCheckItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_PrependCheckItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -33531,7 +33652,7 @@ static PyObject *_wrap_wxMenu_PrependCheckItem(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:wxMenu_PrependCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_PrependCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33582,7 +33703,7 @@ static PyObject *_wrap_wxMenu_PrependCheckItem(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxMenu_PrependRadioItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_PrependRadioItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -33600,7 +33721,7 @@ static PyObject *_wrap_wxMenu_PrependRadioItem(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:wxMenu_PrependRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_PrependRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33651,7 +33772,7 @@ static PyObject *_wrap_wxMenu_PrependRadioItem(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxMenu_PrependMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_PrependMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -33671,7 +33792,7 @@ static PyObject *_wrap_wxMenu_PrependMenu(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:wxMenu_PrependMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_PrependMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33724,7 +33845,7 @@ static PyObject *_wrap_wxMenu_PrependMenu(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenu_Remove(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Remove(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -33735,7 +33856,7 @@ static PyObject *_wrap_wxMenu_Remove(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_Remove",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_Remove",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33758,7 +33879,7 @@ static PyObject *_wrap_wxMenu_Remove(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxMenu_RemoveItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_RemoveItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *arg2 = (wxMenuItem *) 0 ;
@@ -33769,7 +33890,7 @@ static PyObject *_wrap_wxMenu_RemoveItem(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_RemoveItem",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_RemoveItem",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
@@ -33790,7 +33911,7 @@ static PyObject *_wrap_wxMenu_RemoveItem(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMenu_Delete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Delete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -33801,7 +33922,7 @@ static PyObject *_wrap_wxMenu_Delete(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_Delete",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_Delete",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33824,7 +33945,7 @@ static PyObject *_wrap_wxMenu_Delete(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxMenu_DeleteItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_DeleteItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *arg2 = (wxMenuItem *) 0 ;
@@ -33835,7 +33956,7 @@ static PyObject *_wrap_wxMenu_DeleteItem(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_DeleteItem",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_DeleteItem",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
@@ -33856,7 +33977,7 @@ static PyObject *_wrap_wxMenu_DeleteItem(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMenu_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     PyObject * obj0 = 0 ;
@@ -33864,7 +33985,7 @@ static PyObject *_wrap_wxMenu_Destroy(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_Destroy",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_Destroy",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33881,7 +34002,7 @@ static PyObject *_wrap_wxMenu_Destroy(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxMenu_DestroyId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_DestroyId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -33892,7 +34013,7 @@ static PyObject *_wrap_wxMenu_DestroyId(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_DestroyId",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_DestroyId",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33915,7 +34036,7 @@ static PyObject *_wrap_wxMenu_DestroyId(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxMenu_DestroyItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_DestroyItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *arg2 = (wxMenuItem *) 0 ;
@@ -33926,7 +34047,7 @@ static PyObject *_wrap_wxMenu_DestroyItem(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_DestroyItem",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_DestroyItem",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
@@ -33947,7 +34068,7 @@ static PyObject *_wrap_wxMenu_DestroyItem(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenu_GetMenuItemCount(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetMenuItemCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t result;
@@ -33956,7 +34077,7 @@ static PyObject *_wrap_wxMenu_GetMenuItemCount(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_GetMenuItemCount",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetMenuItemCount",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -33975,7 +34096,7 @@ static PyObject *_wrap_wxMenu_GetMenuItemCount(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxMenu_GetMenuItems(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetMenuItems(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     PyObject *result;
@@ -33984,7 +34105,7 @@ static PyObject *_wrap_wxMenu_GetMenuItems(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_GetMenuItems",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetMenuItems",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34001,7 +34122,7 @@ static PyObject *_wrap_wxMenu_GetMenuItems(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenu_FindItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_FindItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxString *arg2 = 0 ;
@@ -34013,7 +34134,7 @@ static PyObject *_wrap_wxMenu_FindItem(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_FindItem",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_FindItem",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34045,7 +34166,7 @@ static PyObject *_wrap_wxMenu_FindItem(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxMenu_FindItemById(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_FindItemById(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -34056,7 +34177,7 @@ static PyObject *_wrap_wxMenu_FindItemById(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_FindItemById",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_FindItemById",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34079,7 +34200,7 @@ static PyObject *_wrap_wxMenu_FindItemById(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenu_FindItemByPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_FindItemByPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -34090,7 +34211,7 @@ static PyObject *_wrap_wxMenu_FindItemByPosition(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "position", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_FindItemByPosition",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_FindItemByPosition",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34113,7 +34234,7 @@ static PyObject *_wrap_wxMenu_FindItemByPosition(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxMenu_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -34125,7 +34246,7 @@ static PyObject *_wrap_wxMenu_Enable(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "id",(char *) "enable", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMenu_Enable",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_Enable",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34150,7 +34271,7 @@ static PyObject *_wrap_wxMenu_Enable(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxMenu_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -34161,7 +34282,7 @@ static PyObject *_wrap_wxMenu_IsEnabled(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_IsEnabled",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_IsEnabled",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34184,7 +34305,7 @@ static PyObject *_wrap_wxMenu_IsEnabled(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxMenu_Check(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Check(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -34196,7 +34317,7 @@ static PyObject *_wrap_wxMenu_Check(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self",(char *) "id",(char *) "check", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMenu_Check",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_Check",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34221,7 +34342,7 @@ static PyObject *_wrap_wxMenu_Check(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxMenu_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -34232,7 +34353,7 @@ static PyObject *_wrap_wxMenu_IsChecked(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_IsChecked",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_IsChecked",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34255,7 +34376,7 @@ static PyObject *_wrap_wxMenu_IsChecked(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxMenu_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -34268,7 +34389,7 @@ static PyObject *_wrap_wxMenu_SetLabel(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "id",(char *) "label", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMenu_SetLabel",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_SetLabel",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34302,7 +34423,7 @@ static PyObject *_wrap_wxMenu_SetLabel(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxMenu_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -34313,7 +34434,7 @@ static PyObject *_wrap_wxMenu_GetLabel(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_GetLabel",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_GetLabel",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34340,7 +34461,7 @@ static PyObject *_wrap_wxMenu_GetLabel(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxMenu_SetHelpString(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_SetHelpString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -34353,7 +34474,7 @@ static PyObject *_wrap_wxMenu_SetHelpString(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "id",(char *) "helpString", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMenu_SetHelpString",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_SetHelpString",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34387,7 +34508,7 @@ static PyObject *_wrap_wxMenu_SetHelpString(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenu_GetHelpString(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetHelpString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -34398,7 +34519,7 @@ static PyObject *_wrap_wxMenu_GetHelpString(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_GetHelpString",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_GetHelpString",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34425,7 +34546,7 @@ static PyObject *_wrap_wxMenu_GetHelpString(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenu_SetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_SetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxString *arg2 = 0 ;
@@ -34436,7 +34557,7 @@ static PyObject *_wrap_wxMenu_SetTitle(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "title", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_SetTitle",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_SetTitle",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34466,7 +34587,7 @@ static PyObject *_wrap_wxMenu_SetTitle(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxMenu_GetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxString result;
@@ -34475,7 +34596,7 @@ static PyObject *_wrap_wxMenu_GetTitle(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_GetTitle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetTitle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34498,7 +34619,7 @@ static PyObject *_wrap_wxMenu_GetTitle(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxMenu_SetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_SetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) 0 ;
@@ -34508,7 +34629,7 @@ static PyObject *_wrap_wxMenu_SetEventHandler(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "handler", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_SetEventHandler",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_SetEventHandler",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxEvtHandler, SWIG_POINTER_EXCEPTION | 0);
@@ -34527,7 +34648,7 @@ static PyObject *_wrap_wxMenu_SetEventHandler(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenu_GetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxEvtHandler *result;
@@ -34536,7 +34657,7 @@ static PyObject *_wrap_wxMenu_GetEventHandler(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_GetEventHandler",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetEventHandler",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34555,7 +34676,7 @@ static PyObject *_wrap_wxMenu_GetEventHandler(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenu_SetInvokingWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_SetInvokingWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -34565,7 +34686,7 @@ static PyObject *_wrap_wxMenu_SetInvokingWindow(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_SetInvokingWindow",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_SetInvokingWindow",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -34584,7 +34705,7 @@ static PyObject *_wrap_wxMenu_SetInvokingWindow(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxMenu_GetInvokingWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetInvokingWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxWindow *result;
@@ -34593,7 +34714,7 @@ static PyObject *_wrap_wxMenu_GetInvokingWindow(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_GetInvokingWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetInvokingWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34612,7 +34733,7 @@ static PyObject *_wrap_wxMenu_GetInvokingWindow(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxMenu_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     long result;
@@ -34621,7 +34742,7 @@ static PyObject *_wrap_wxMenu_GetStyle(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_GetStyle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetStyle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34640,7 +34761,7 @@ static PyObject *_wrap_wxMenu_GetStyle(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxMenu_UpdateUI(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_UpdateUI(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) NULL ;
@@ -34650,7 +34771,7 @@ static PyObject *_wrap_wxMenu_UpdateUI(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "source", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxMenu_UpdateUI",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Menu_UpdateUI",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -34671,7 +34792,7 @@ static PyObject *_wrap_wxMenu_UpdateUI(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxMenu_GetMenuBar(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetMenuBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuBar *result;
@@ -34680,7 +34801,7 @@ static PyObject *_wrap_wxMenu_GetMenuBar(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_GetMenuBar",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetMenuBar",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34699,7 +34820,7 @@ static PyObject *_wrap_wxMenu_GetMenuBar(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMenu_Attach(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Attach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuBarBase *arg2 = (wxMenuBarBase *) 0 ;
@@ -34709,7 +34830,7 @@ static PyObject *_wrap_wxMenu_Attach(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "menubar", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_Attach",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_Attach",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxMenuBarBase, SWIG_POINTER_EXCEPTION | 0);
@@ -34728,7 +34849,7 @@ static PyObject *_wrap_wxMenu_Attach(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxMenu_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     PyObject * obj0 = 0 ;
@@ -34736,7 +34857,7 @@ static PyObject *_wrap_wxMenu_Detach(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_Detach",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_Detach",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34753,7 +34874,7 @@ static PyObject *_wrap_wxMenu_Detach(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxMenu_IsAttached(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_IsAttached(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     bool result;
@@ -34762,7 +34883,7 @@ static PyObject *_wrap_wxMenu_IsAttached(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_IsAttached",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_IsAttached",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34781,7 +34902,7 @@ static PyObject *_wrap_wxMenu_IsAttached(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMenu_SetParent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_SetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -34791,7 +34912,7 @@ static PyObject *_wrap_wxMenu_SetParent(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "parent", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenu_SetParent",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_SetParent",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
@@ -34810,7 +34931,7 @@ static PyObject *_wrap_wxMenu_SetParent(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxMenu_GetParent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenu *result;
@@ -34819,7 +34940,7 @@ static PyObject *_wrap_wxMenu_GetParent(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenu_GetParent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetParent",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34838,14 +34959,14 @@ static PyObject *_wrap_wxMenu_GetParent(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxMenu_swigregister(PyObject *, PyObject *args) {
+static PyObject * Menu_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMenu, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxMenuBar(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MenuBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 = (long) 0 ;
     wxMenuBar *result;
@@ -34854,7 +34975,7 @@ static PyObject *_wrap_new_wxMenuBar(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "style", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxMenuBar",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MenuBar",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (long)(SWIG_As_long(obj0)); 
@@ -34876,7 +34997,7 @@ static PyObject *_wrap_new_wxMenuBar(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxMenuBar_Append(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Append(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -34890,7 +35011,7 @@ static PyObject *_wrap_wxMenuBar_Append(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "menu",(char *) "title", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMenuBar_Append",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_Append",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
@@ -34924,7 +35045,7 @@ static PyObject *_wrap_wxMenuBar_Append(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxMenuBar_Insert(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Insert(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -34940,7 +35061,7 @@ static PyObject *_wrap_wxMenuBar_Insert(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "pos",(char *) "menu",(char *) "title", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxMenuBar_Insert",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:MenuBar_Insert",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -34978,7 +35099,7 @@ static PyObject *_wrap_wxMenuBar_Insert(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxMenuBar_GetMenuCount(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_GetMenuCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t result;
@@ -34987,7 +35108,7 @@ static PyObject *_wrap_wxMenuBar_GetMenuCount(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuBar_GetMenuCount",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuBar_GetMenuCount",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35006,7 +35127,7 @@ static PyObject *_wrap_wxMenuBar_GetMenuCount(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenuBar_GetMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_GetMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -35017,7 +35138,7 @@ static PyObject *_wrap_wxMenuBar_GetMenu(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "pos", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuBar_GetMenu",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetMenu",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35040,7 +35161,7 @@ static PyObject *_wrap_wxMenuBar_GetMenu(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMenuBar_Replace(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Replace(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -35056,7 +35177,7 @@ static PyObject *_wrap_wxMenuBar_Replace(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "pos",(char *) "menu",(char *) "title", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxMenuBar_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:MenuBar_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35094,7 +35215,7 @@ static PyObject *_wrap_wxMenuBar_Replace(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMenuBar_Remove(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Remove(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -35105,7 +35226,7 @@ static PyObject *_wrap_wxMenuBar_Remove(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "pos", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuBar_Remove",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_Remove",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35128,7 +35249,7 @@ static PyObject *_wrap_wxMenuBar_Remove(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxMenuBar_EnableTop(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_EnableTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -35140,7 +35261,7 @@ static PyObject *_wrap_wxMenuBar_EnableTop(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "pos",(char *) "enable", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMenuBar_EnableTop",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_EnableTop",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35165,7 +35286,7 @@ static PyObject *_wrap_wxMenuBar_EnableTop(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenuBar_IsEnabledTop(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_IsEnabledTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -35176,7 +35297,7 @@ static PyObject *_wrap_wxMenuBar_IsEnabledTop(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "pos", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuBar_IsEnabledTop",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsEnabledTop",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35199,7 +35320,7 @@ static PyObject *_wrap_wxMenuBar_IsEnabledTop(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenuBar_SetLabelTop(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_SetLabelTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -35212,7 +35333,7 @@ static PyObject *_wrap_wxMenuBar_SetLabelTop(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "pos",(char *) "label", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMenuBar_SetLabelTop",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetLabelTop",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35246,7 +35367,7 @@ static PyObject *_wrap_wxMenuBar_SetLabelTop(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMenuBar_GetLabelTop(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_GetLabelTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -35257,7 +35378,7 @@ static PyObject *_wrap_wxMenuBar_GetLabelTop(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "pos", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuBar_GetLabelTop",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetLabelTop",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35284,7 +35405,7 @@ static PyObject *_wrap_wxMenuBar_GetLabelTop(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     wxString *arg2 = 0 ;
@@ -35299,7 +35420,7 @@ static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "menu",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMenuBar_FindMenuItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_FindMenuItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35344,7 +35465,7 @@ static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenuBar_FindItemById(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_FindItemById(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -35355,7 +35476,7 @@ static PyObject *_wrap_wxMenuBar_FindItemById(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuBar_FindItemById",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_FindItemById",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35378,7 +35499,7 @@ static PyObject *_wrap_wxMenuBar_FindItemById(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenuBar_FindMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_FindMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     wxString *arg2 = 0 ;
@@ -35390,7 +35511,7 @@ static PyObject *_wrap_wxMenuBar_FindMenu(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "title", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuBar_FindMenu",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_FindMenu",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35400,7 +35521,7 @@ static PyObject *_wrap_wxMenuBar_FindMenu(PyObject *, PyObject *args, PyObject *
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (int)((wxMenuBar const *)arg1)->FindMenu((wxString const &)*arg2);
+        result = (int)(arg1)->FindMenu((wxString const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -35422,7 +35543,7 @@ static PyObject *_wrap_wxMenuBar_FindMenu(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuBar_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -35434,7 +35555,7 @@ static PyObject *_wrap_wxMenuBar_Enable(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "id",(char *) "enable", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMenuBar_Enable",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_Enable",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35459,7 +35580,7 @@ static PyObject *_wrap_wxMenuBar_Enable(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxMenuBar_Check(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Check(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -35471,7 +35592,7 @@ static PyObject *_wrap_wxMenuBar_Check(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "id",(char *) "check", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMenuBar_Check",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_Check",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35496,7 +35617,7 @@ static PyObject *_wrap_wxMenuBar_Check(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxMenuBar_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -35507,7 +35628,7 @@ static PyObject *_wrap_wxMenuBar_IsChecked(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuBar_IsChecked",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsChecked",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35530,7 +35651,7 @@ static PyObject *_wrap_wxMenuBar_IsChecked(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenuBar_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -35541,7 +35662,7 @@ static PyObject *_wrap_wxMenuBar_IsEnabled(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuBar_IsEnabled",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsEnabled",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35564,7 +35685,7 @@ static PyObject *_wrap_wxMenuBar_IsEnabled(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenuBar_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -35577,7 +35698,7 @@ static PyObject *_wrap_wxMenuBar_SetLabel(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "id",(char *) "label", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMenuBar_SetLabel",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetLabel",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35611,7 +35732,7 @@ static PyObject *_wrap_wxMenuBar_SetLabel(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuBar_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -35622,7 +35743,7 @@ static PyObject *_wrap_wxMenuBar_GetLabel(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuBar_GetLabel",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetLabel",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35649,7 +35770,7 @@ static PyObject *_wrap_wxMenuBar_GetLabel(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuBar_SetHelpString(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_SetHelpString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -35662,7 +35783,7 @@ static PyObject *_wrap_wxMenuBar_SetHelpString(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "id",(char *) "helpString", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxMenuBar_SetHelpString",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetHelpString",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35696,7 +35817,7 @@ static PyObject *_wrap_wxMenuBar_SetHelpString(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxMenuBar_GetHelpString(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_GetHelpString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -35707,7 +35828,7 @@ static PyObject *_wrap_wxMenuBar_GetHelpString(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuBar_GetHelpString",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetHelpString",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35734,7 +35855,7 @@ static PyObject *_wrap_wxMenuBar_GetHelpString(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxMenuBar_GetFrame(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_GetFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     wxFrame *result;
@@ -35743,7 +35864,7 @@ static PyObject *_wrap_wxMenuBar_GetFrame(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuBar_GetFrame",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuBar_GetFrame",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35762,7 +35883,7 @@ static PyObject *_wrap_wxMenuBar_GetFrame(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuBar_IsAttached(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_IsAttached(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     bool result;
@@ -35771,7 +35892,7 @@ static PyObject *_wrap_wxMenuBar_IsAttached(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuBar_IsAttached",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuBar_IsAttached",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35790,7 +35911,7 @@ static PyObject *_wrap_wxMenuBar_IsAttached(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenuBar_Attach(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Attach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     wxFrame *arg2 = (wxFrame *) 0 ;
@@ -35800,7 +35921,7 @@ static PyObject *_wrap_wxMenuBar_Attach(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "frame", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuBar_Attach",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_Attach",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxFrame, SWIG_POINTER_EXCEPTION | 0);
@@ -35819,7 +35940,7 @@ static PyObject *_wrap_wxMenuBar_Attach(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxMenuBar_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     PyObject * obj0 = 0 ;
@@ -35827,7 +35948,7 @@ static PyObject *_wrap_wxMenuBar_Detach(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuBar_Detach",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuBar_Detach",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35844,14 +35965,65 @@ static PyObject *_wrap_wxMenuBar_Detach(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxMenuBar_swigregister(PyObject *, PyObject *args) {
+static PyObject *_wrap_MenuBar_SetAutoWindowMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    bool arg1 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "enable", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuBar_SetAutoWindowMenu",kwnames,&obj0)) goto fail;
+    {
+        arg1 = (bool)(SWIG_As_bool(obj0)); 
+        if (SWIG_arg_fail(1)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        wxMenuBar::SetAutoWindowMenu(arg1);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_MenuBar_GetAutoWindowMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    bool result;
+    char *kwnames[] = {
+        NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":MenuBar_GetAutoWindowMenu",kwnames)) goto fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)wxMenuBar::GetAutoWindowMenu();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject * MenuBar_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMenuBar, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxMenuItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MenuItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) NULL ;
     int arg2 = (int) wxID_ANY ;
@@ -35874,7 +36046,7 @@ static PyObject *_wrap_new_wxMenuItem(PyObject *, PyObject *args, PyObject *kwar
         (char *) "parentMenu",(char *) "id",(char *) "text",(char *) "help",(char *) "kind",(char *) "subMenu", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_wxMenuItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_MenuItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if (obj0) {
         SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -35941,7 +36113,7 @@ static PyObject *_wrap_new_wxMenuItem(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxMenu *result;
@@ -35950,7 +36122,7 @@ static PyObject *_wrap_wxMenuItem_GetMenu(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetMenu",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetMenu",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -35969,7 +36141,7 @@ static PyObject *_wrap_wxMenuItem_GetMenu(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -35979,7 +36151,7 @@ static PyObject *_wrap_wxMenuItem_SetMenu(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "menu", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetMenu",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetMenu",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
@@ -35998,7 +36170,7 @@ static PyObject *_wrap_wxMenuItem_SetMenu(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     int arg2 ;
@@ -36008,7 +36180,7 @@ static PyObject *_wrap_wxMenuItem_SetId(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "id", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetId",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetId",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36029,7 +36201,7 @@ static PyObject *_wrap_wxMenuItem_SetId(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     int result;
@@ -36038,7 +36210,7 @@ static PyObject *_wrap_wxMenuItem_GetId(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetId",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetId",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36057,7 +36229,7 @@ static PyObject *_wrap_wxMenuItem_GetId(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxMenuItem_IsSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_IsSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool result;
@@ -36066,7 +36238,7 @@ static PyObject *_wrap_wxMenuItem_IsSeparator(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_IsSeparator",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_IsSeparator",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36085,7 +36257,7 @@ static PyObject *_wrap_wxMenuItem_IsSeparator(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxString *arg2 = 0 ;
@@ -36096,7 +36268,7 @@ static PyObject *_wrap_wxMenuItem_SetText(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "str", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetText",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetText",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36126,7 +36298,7 @@ static PyObject *_wrap_wxMenuItem_SetText(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxString result;
@@ -36135,7 +36307,7 @@ static PyObject *_wrap_wxMenuItem_GetLabel(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetLabel",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetLabel",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36158,7 +36330,7 @@ static PyObject *_wrap_wxMenuItem_GetLabel(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxString *result;
@@ -36167,7 +36339,7 @@ static PyObject *_wrap_wxMenuItem_GetText(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetText",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetText",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36193,7 +36365,7 @@ static PyObject *_wrap_wxMenuItem_GetText(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetLabelFromText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetLabelFromText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
@@ -36203,7 +36375,7 @@ static PyObject *_wrap_wxMenuItem_GetLabelFromText(PyObject *, PyObject *args, P
         (char *) "text", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetLabelFromText",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetLabelFromText",kwnames,&obj0)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
@@ -36237,7 +36409,7 @@ static PyObject *_wrap_wxMenuItem_GetLabelFromText(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetKind(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetKind(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxItemKind result;
@@ -36246,7 +36418,7 @@ static PyObject *_wrap_wxMenuItem_GetKind(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetKind",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetKind",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36263,7 +36435,7 @@ static PyObject *_wrap_wxMenuItem_GetKind(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetKind(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetKind(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxItemKind arg2 ;
@@ -36273,7 +36445,7 @@ static PyObject *_wrap_wxMenuItem_SetKind(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "kind", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetKind",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetKind",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36294,7 +36466,7 @@ static PyObject *_wrap_wxMenuItem_SetKind(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetCheckable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetCheckable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool arg2 ;
@@ -36304,7 +36476,7 @@ static PyObject *_wrap_wxMenuItem_SetCheckable(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "checkable", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetCheckable",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetCheckable",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36325,7 +36497,7 @@ static PyObject *_wrap_wxMenuItem_SetCheckable(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxMenuItem_IsCheckable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_IsCheckable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool result;
@@ -36334,7 +36506,7 @@ static PyObject *_wrap_wxMenuItem_IsCheckable(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_IsCheckable",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_IsCheckable",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36353,7 +36525,7 @@ static PyObject *_wrap_wxMenuItem_IsCheckable(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxMenuItem_IsSubMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_IsSubMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool result;
@@ -36362,7 +36534,7 @@ static PyObject *_wrap_wxMenuItem_IsSubMenu(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_IsSubMenu",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_IsSubMenu",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36381,7 +36553,7 @@ static PyObject *_wrap_wxMenuItem_IsSubMenu(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetSubMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetSubMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -36391,7 +36563,7 @@ static PyObject *_wrap_wxMenuItem_SetSubMenu(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "menu", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetSubMenu",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetSubMenu",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0);
@@ -36410,7 +36582,7 @@ static PyObject *_wrap_wxMenuItem_SetSubMenu(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetSubMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetSubMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxMenu *result;
@@ -36419,7 +36591,7 @@ static PyObject *_wrap_wxMenuItem_GetSubMenu(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetSubMenu",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetSubMenu",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36438,7 +36610,7 @@ static PyObject *_wrap_wxMenuItem_GetSubMenu(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMenuItem_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool arg2 = (bool) true ;
@@ -36448,7 +36620,7 @@ static PyObject *_wrap_wxMenuItem_Enable(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "enable", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxMenuItem_Enable",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MenuItem_Enable",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -36471,7 +36643,7 @@ static PyObject *_wrap_wxMenuItem_Enable(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMenuItem_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool result;
@@ -36480,7 +36652,7 @@ static PyObject *_wrap_wxMenuItem_IsEnabled(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_IsEnabled",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_IsEnabled",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36499,7 +36671,7 @@ static PyObject *_wrap_wxMenuItem_IsEnabled(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenuItem_Check(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_Check(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool arg2 = (bool) true ;
@@ -36509,7 +36681,7 @@ static PyObject *_wrap_wxMenuItem_Check(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "check", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxMenuItem_Check",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MenuItem_Check",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -36532,7 +36704,7 @@ static PyObject *_wrap_wxMenuItem_Check(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxMenuItem_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool result;
@@ -36541,7 +36713,7 @@ static PyObject *_wrap_wxMenuItem_IsChecked(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_IsChecked",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_IsChecked",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36560,7 +36732,7 @@ static PyObject *_wrap_wxMenuItem_IsChecked(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenuItem_Toggle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_Toggle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     PyObject * obj0 = 0 ;
@@ -36568,7 +36740,7 @@ static PyObject *_wrap_wxMenuItem_Toggle(PyObject *, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_Toggle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_Toggle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36585,7 +36757,7 @@ static PyObject *_wrap_wxMenuItem_Toggle(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetHelp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxString *arg2 = 0 ;
@@ -36596,7 +36768,7 @@ static PyObject *_wrap_wxMenuItem_SetHelp(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "str", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetHelp",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetHelp",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36626,7 +36798,7 @@ static PyObject *_wrap_wxMenuItem_SetHelp(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetHelp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxString *result;
@@ -36635,7 +36807,7 @@ static PyObject *_wrap_wxMenuItem_GetHelp(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetHelp",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetHelp",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36661,7 +36833,7 @@ static PyObject *_wrap_wxMenuItem_GetHelp(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetAccel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetAccel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxAcceleratorEntry *result;
@@ -36670,7 +36842,7 @@ static PyObject *_wrap_wxMenuItem_GetAccel(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetAccel",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetAccel",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36687,7 +36859,7 @@ static PyObject *_wrap_wxMenuItem_GetAccel(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetAccel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetAccel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxAcceleratorEntry *arg2 = (wxAcceleratorEntry *) 0 ;
@@ -36697,7 +36869,7 @@ static PyObject *_wrap_wxMenuItem_SetAccel(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "accel", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetAccel",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetAccel",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxAcceleratorEntry, SWIG_POINTER_EXCEPTION | 0);
@@ -36716,7 +36888,7 @@ static PyObject *_wrap_wxMenuItem_SetAccel(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxFont *arg2 = 0 ;
@@ -36726,7 +36898,7 @@ static PyObject *_wrap_wxMenuItem_SetFont(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "font", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetFont",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetFont",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36751,7 +36923,7 @@ static PyObject *_wrap_wxMenuItem_SetFont(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxFont result;
@@ -36760,7 +36932,7 @@ static PyObject *_wrap_wxMenuItem_GetFont(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetFont",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetFont",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36781,7 +36953,7 @@ static PyObject *_wrap_wxMenuItem_GetFont(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxColour *arg2 = 0 ;
@@ -36792,7 +36964,7 @@ static PyObject *_wrap_wxMenuItem_SetTextColour(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "colText", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetTextColour",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetTextColour",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36813,7 +36985,7 @@ static PyObject *_wrap_wxMenuItem_SetTextColour(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxColour result;
@@ -36822,7 +36994,7 @@ static PyObject *_wrap_wxMenuItem_GetTextColour(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetTextColour",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetTextColour",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36843,7 +37015,7 @@ static PyObject *_wrap_wxMenuItem_GetTextColour(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxColour *arg2 = 0 ;
@@ -36854,7 +37026,7 @@ static PyObject *_wrap_wxMenuItem_SetBackgroundColour(PyObject *, PyObject *args
         (char *) "self",(char *) "colBack", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetBackgroundColour",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetBackgroundColour",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36875,7 +37047,7 @@ static PyObject *_wrap_wxMenuItem_SetBackgroundColour(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxColour result;
@@ -36884,7 +37056,7 @@ static PyObject *_wrap_wxMenuItem_GetBackgroundColour(PyObject *, PyObject *args
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetBackgroundColour",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetBackgroundColour",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36905,7 +37077,7 @@ static PyObject *_wrap_wxMenuItem_GetBackgroundColour(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetBitmaps(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetBitmaps(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -36918,7 +37090,7 @@ static PyObject *_wrap_wxMenuItem_SetBitmaps(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "bmpChecked",(char *) "bmpUnchecked", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxMenuItem_SetBitmaps",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:MenuItem_SetBitmaps",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36953,7 +37125,7 @@ static PyObject *_wrap_wxMenuItem_SetBitmaps(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetDisabledBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetDisabledBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -36963,7 +37135,7 @@ static PyObject *_wrap_wxMenuItem_SetDisabledBitmap(PyObject *, PyObject *args,
         (char *) "self",(char *) "bmpDisabled", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetDisabledBitmap",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetDisabledBitmap",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -36988,7 +37160,7 @@ static PyObject *_wrap_wxMenuItem_SetDisabledBitmap(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetDisabledBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetDisabledBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxBitmap *result;
@@ -36997,7 +37169,7 @@ static PyObject *_wrap_wxMenuItem_GetDisabledBitmap(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetDisabledBitmap",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetDisabledBitmap",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37020,7 +37192,7 @@ static PyObject *_wrap_wxMenuItem_GetDisabledBitmap(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetMarginWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetMarginWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     int arg2 ;
@@ -37030,7 +37202,7 @@ static PyObject *_wrap_wxMenuItem_SetMarginWidth(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "nWidth", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetMarginWidth",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetMarginWidth",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37051,7 +37223,7 @@ static PyObject *_wrap_wxMenuItem_SetMarginWidth(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetMarginWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetMarginWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     int result;
@@ -37060,7 +37232,7 @@ static PyObject *_wrap_wxMenuItem_GetMarginWidth(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetMarginWidth",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetMarginWidth",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37079,17 +37251,17 @@ static PyObject *_wrap_wxMenuItem_GetMarginWidth(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetDefaultMarginWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetDefaultMarginWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":wxMenuItem_GetDefaultMarginWidth",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":MenuItem_GetDefaultMarginWidth",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (int)wxMenuItem_GetDefaultMarginWidth();
+        result = (int)MenuItem_GetDefaultMarginWidth();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -37103,7 +37275,7 @@ static PyObject *_wrap_wxMenuItem_GetDefaultMarginWidth(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_wxMenuItem_IsOwnerDrawn(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_IsOwnerDrawn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool result;
@@ -37112,7 +37284,7 @@ static PyObject *_wrap_wxMenuItem_IsOwnerDrawn(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_IsOwnerDrawn",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_IsOwnerDrawn",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37131,7 +37303,7 @@ static PyObject *_wrap_wxMenuItem_IsOwnerDrawn(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetOwnerDrawn(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetOwnerDrawn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool arg2 = (bool) true ;
@@ -37141,7 +37313,7 @@ static PyObject *_wrap_wxMenuItem_SetOwnerDrawn(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "ownerDrawn", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxMenuItem_SetOwnerDrawn",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MenuItem_SetOwnerDrawn",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -37164,7 +37336,7 @@ static PyObject *_wrap_wxMenuItem_SetOwnerDrawn(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxMenuItem_ResetOwnerDrawn(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_ResetOwnerDrawn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     PyObject * obj0 = 0 ;
@@ -37172,7 +37344,7 @@ static PyObject *_wrap_wxMenuItem_ResetOwnerDrawn(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_ResetOwnerDrawn",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_ResetOwnerDrawn",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37189,7 +37361,7 @@ static PyObject *_wrap_wxMenuItem_ResetOwnerDrawn(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxMenuItem_SetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -37199,7 +37371,7 @@ static PyObject *_wrap_wxMenuItem_SetBitmap(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "bitmap", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxMenuItem_SetBitmap",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetBitmap",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37224,7 +37396,7 @@ static PyObject *_wrap_wxMenuItem_SetBitmap(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxMenuItem_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxBitmap *result;
@@ -37233,7 +37405,7 @@ static PyObject *_wrap_wxMenuItem_GetBitmap(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxMenuItem_GetBitmap",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetBitmap",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMenuItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37256,7 +37428,7 @@ static PyObject *_wrap_wxMenuItem_GetBitmap(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject * wxMenuItem_swigregister(PyObject *, PyObject *args) {
+static PyObject * MenuItem_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMenuItem, obj);
@@ -37283,7 +37455,7 @@ static PyObject *_wrap_ControlNameStr_get(void) {
 }
 
 
-static PyObject *_wrap_new_wxControl(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Control(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -37311,7 +37483,7 @@ static PyObject *_wrap_new_wxControl(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_wxControl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_Control",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -37401,7 +37573,7 @@ static PyObject *_wrap_new_PreControl(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxControl_Create(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Control_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxControl *arg1 = (wxControl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -37431,7 +37603,7 @@ static PyObject *_wrap_wxControl_Create(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:wxControl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:Control_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxControl, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -37501,7 +37673,7 @@ static PyObject *_wrap_wxControl_Create(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxControl_Command(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Control_Command(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxControl *arg1 = (wxControl *) 0 ;
     wxCommandEvent *arg2 = 0 ;
@@ -37511,7 +37683,7 @@ static PyObject *_wrap_wxControl_Command(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "event", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxControl_Command",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Control_Command",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxControl, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37536,7 +37708,7 @@ static PyObject *_wrap_wxControl_Command(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxControl_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Control_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxControl *arg1 = (wxControl *) 0 ;
     wxString result;
@@ -37545,7 +37717,7 @@ static PyObject *_wrap_wxControl_GetLabel(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxControl_GetLabel",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Control_GetLabel",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxControl, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37568,7 +37740,7 @@ static PyObject *_wrap_wxControl_GetLabel(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxControl_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Control_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxControl *arg1 = (wxControl *) 0 ;
     wxString *arg2 = 0 ;
@@ -37579,7 +37751,7 @@ static PyObject *_wrap_wxControl_SetLabel(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "label", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxControl_SetLabel",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Control_SetLabel",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxControl, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37609,7 +37781,7 @@ static PyObject *_wrap_wxControl_SetLabel(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxControl_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -37618,7 +37790,7 @@ static PyObject *_wrap_wxControl_GetClassDefaultAttributes(PyObject *, PyObject
         (char *) "variant", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:wxControl_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Control_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (wxWindowVariant)(SWIG_As_int(obj0)); 
@@ -37644,14 +37816,14 @@ static PyObject *_wrap_wxControl_GetClassDefaultAttributes(PyObject *, PyObject
 }
 
 
-static PyObject * wxControl_swigregister(PyObject *, PyObject *args) {
+static PyObject * Control_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxControl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxItemContainer_Append(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_Append(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxString *arg2 = 0 ;
@@ -37665,7 +37837,7 @@ static PyObject *_wrap_wxItemContainer_Append(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "item",(char *) "clientData", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxItemContainer_Append",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ItemContainer_Append",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37700,7 +37872,7 @@ static PyObject *_wrap_wxItemContainer_Append(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxItemContainer_AppendItems(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_AppendItems(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxArrayString *arg2 = 0 ;
@@ -37711,7 +37883,7 @@ static PyObject *_wrap_wxItemContainer_AppendItems(PyObject *, PyObject *args, P
         (char *) "self",(char *) "strings", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxItemContainer_AppendItems",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_AppendItems",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37724,15 +37896,11 @@ static PyObject *_wrap_wxItemContainer_AppendItems(PyObject *, PyObject *args, P
         int i, len=PySequence_Length(obj1);
         for (i=0; i<len; i++) {
             PyObject* item = PySequence_GetItem(obj1, i);
-#if wxUSE_UNICODE
-            PyObject* str  = PyObject_Unicode(item);
-#else
-            PyObject* str  = PyObject_Str(item);
-#endif
+            wxString* s = wxString_in_helper(item);
             if (PyErr_Occurred())  SWIG_fail;
-            arg2->Add(Py2wxString(str));
+            arg2->Add(*s);
+            delete s;
             Py_DECREF(item);
-            Py_DECREF(str);
         }
     }
     {
@@ -37755,7 +37923,7 @@ static PyObject *_wrap_wxItemContainer_AppendItems(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxItemContainer_Insert(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_Insert(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxString *arg2 = 0 ;
@@ -37771,7 +37939,7 @@ static PyObject *_wrap_wxItemContainer_Insert(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "item",(char *) "pos",(char *) "clientData", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:wxItemContainer_Insert",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ItemContainer_Insert",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37810,7 +37978,7 @@ static PyObject *_wrap_wxItemContainer_Insert(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxItemContainer_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -37818,7 +37986,7 @@ static PyObject *_wrap_wxItemContainer_Clear(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxItemContainer_Clear",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ItemContainer_Clear",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37835,7 +38003,7 @@ static PyObject *_wrap_wxItemContainer_Clear(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxItemContainer_Delete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_Delete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
@@ -37845,7 +38013,7 @@ static PyObject *_wrap_wxItemContainer_Delete(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "n", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxItemContainer_Delete",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_Delete",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37866,7 +38034,7 @@ static PyObject *_wrap_wxItemContainer_Delete(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxItemContainer_GetClientData(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_GetClientData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
@@ -37877,7 +38045,7 @@ static PyObject *_wrap_wxItemContainer_GetClientData(PyObject *, PyObject *args,
         (char *) "self",(char *) "n", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxItemContainer_GetClientData",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_GetClientData",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37898,7 +38066,7 @@ static PyObject *_wrap_wxItemContainer_GetClientData(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxItemContainer_SetClientData(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_SetClientData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
@@ -37910,7 +38078,7 @@ static PyObject *_wrap_wxItemContainer_SetClientData(PyObject *, PyObject *args,
         (char *) "self",(char *) "n",(char *) "clientData", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxItemContainer_SetClientData",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ItemContainer_SetClientData",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37932,7 +38100,7 @@ static PyObject *_wrap_wxItemContainer_SetClientData(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxItemContainer_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int result;
@@ -37941,7 +38109,7 @@ static PyObject *_wrap_wxItemContainer_GetCount(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxItemContainer_GetCount",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ItemContainer_GetCount",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37960,7 +38128,7 @@ static PyObject *_wrap_wxItemContainer_GetCount(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxItemContainer_IsEmpty(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_IsEmpty(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     bool result;
@@ -37969,7 +38137,7 @@ static PyObject *_wrap_wxItemContainer_IsEmpty(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxItemContainer_IsEmpty",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ItemContainer_IsEmpty",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -37988,7 +38156,7 @@ static PyObject *_wrap_wxItemContainer_IsEmpty(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxItemContainer_GetString(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_GetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
@@ -37999,7 +38167,7 @@ static PyObject *_wrap_wxItemContainer_GetString(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "n", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxItemContainer_GetString",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_GetString",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38026,7 +38194,7 @@ static PyObject *_wrap_wxItemContainer_GetString(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxItemContainer_GetStrings(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_GetStrings(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxArrayString result;
@@ -38035,7 +38203,7 @@ static PyObject *_wrap_wxItemContainer_GetStrings(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxItemContainer_GetStrings",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ItemContainer_GetStrings",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38054,7 +38222,7 @@ static PyObject *_wrap_wxItemContainer_GetStrings(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxItemContainer_SetString(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_SetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
@@ -38067,7 +38235,7 @@ static PyObject *_wrap_wxItemContainer_SetString(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "n",(char *) "s", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxItemContainer_SetString",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ItemContainer_SetString",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38101,7 +38269,7 @@ static PyObject *_wrap_wxItemContainer_SetString(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxItemContainer_FindString(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_FindString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxString *arg2 = 0 ;
@@ -38113,7 +38281,7 @@ static PyObject *_wrap_wxItemContainer_FindString(PyObject *, PyObject *args, Py
         (char *) "self",(char *) "s", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxItemContainer_FindString",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_FindString",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38145,7 +38313,7 @@ static PyObject *_wrap_wxItemContainer_FindString(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxItemContainer_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
@@ -38155,7 +38323,7 @@ static PyObject *_wrap_wxItemContainer_SetSelection(PyObject *, PyObject *args,
         (char *) "self",(char *) "n", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxItemContainer_SetSelection",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_SetSelection",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38176,7 +38344,7 @@ static PyObject *_wrap_wxItemContainer_SetSelection(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxItemContainer_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int result;
@@ -38185,7 +38353,7 @@ static PyObject *_wrap_wxItemContainer_GetSelection(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxItemContainer_GetSelection",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ItemContainer_GetSelection",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38204,7 +38372,7 @@ static PyObject *_wrap_wxItemContainer_GetSelection(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxItemContainer_SetStringSelection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_SetStringSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxString *arg2 = 0 ;
@@ -38216,7 +38384,7 @@ static PyObject *_wrap_wxItemContainer_SetStringSelection(PyObject *, PyObject *
         (char *) "self",(char *) "s", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxItemContainer_SetStringSelection",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_SetStringSelection",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38248,7 +38416,7 @@ static PyObject *_wrap_wxItemContainer_SetStringSelection(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_wxItemContainer_GetStringSelection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_GetStringSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxString result;
@@ -38257,7 +38425,7 @@ static PyObject *_wrap_wxItemContainer_GetStringSelection(PyObject *, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxItemContainer_GetStringSelection",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ItemContainer_GetStringSelection",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38280,7 +38448,7 @@ static PyObject *_wrap_wxItemContainer_GetStringSelection(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_wxItemContainer_Select(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_Select(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
@@ -38290,7 +38458,7 @@ static PyObject *_wrap_wxItemContainer_Select(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "n", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxItemContainer_Select",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_Select",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxItemContainer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38311,28 +38479,28 @@ static PyObject *_wrap_wxItemContainer_Select(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject * wxItemContainer_swigregister(PyObject *, PyObject *args) {
+static PyObject * ItemContainer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxItemContainer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject * wxControlWithItems_swigregister(PyObject *, PyObject *args) {
+static PyObject * ControlWithItems_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxControlWithItems, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxSizerItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SizerItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxSizerItem",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_SizerItem",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxSizerItem *)new wxSizerItem();
@@ -38502,7 +38670,7 @@ static PyObject *_wrap_new_SizerItemSizer(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxSizerItem_DeleteWindows(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_DeleteWindows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     PyObject * obj0 = 0 ;
@@ -38510,7 +38678,7 @@ static PyObject *_wrap_wxSizerItem_DeleteWindows(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_DeleteWindows",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_DeleteWindows",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38527,7 +38695,7 @@ static PyObject *_wrap_wxSizerItem_DeleteWindows(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxSizerItem_DetachSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_DetachSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     PyObject * obj0 = 0 ;
@@ -38535,7 +38703,7 @@ static PyObject *_wrap_wxSizerItem_DetachSizer(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_DetachSizer",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_DetachSizer",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38552,7 +38720,7 @@ static PyObject *_wrap_wxSizerItem_DetachSizer(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxSizerItem_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize result;
@@ -38561,7 +38729,7 @@ static PyObject *_wrap_wxSizerItem_GetSize(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_GetSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38582,7 +38750,7 @@ static PyObject *_wrap_wxSizerItem_GetSize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizerItem_CalcMin(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_CalcMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize result;
@@ -38591,7 +38759,7 @@ static PyObject *_wrap_wxSizerItem_CalcMin(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_CalcMin",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_CalcMin",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38612,7 +38780,7 @@ static PyObject *_wrap_wxSizerItem_CalcMin(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizerItem_SetDimension(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetDimension(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxPoint arg2 ;
@@ -38624,7 +38792,7 @@ static PyObject *_wrap_wxSizerItem_SetDimension(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "pos",(char *) "size", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxSizerItem_SetDimension",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SizerItem_SetDimension",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38661,7 +38829,7 @@ static PyObject *_wrap_wxSizerItem_SetDimension(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxSizerItem_GetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize result;
@@ -38670,7 +38838,7 @@ static PyObject *_wrap_wxSizerItem_GetMinSize(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_GetMinSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetMinSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38691,7 +38859,7 @@ static PyObject *_wrap_wxSizerItem_GetMinSize(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxSizerItem_GetMinSizeWithBorder(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetMinSizeWithBorder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize result;
@@ -38700,7 +38868,7 @@ static PyObject *_wrap_wxSizerItem_GetMinSizeWithBorder(PyObject *, PyObject *ar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_GetMinSizeWithBorder",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetMinSizeWithBorder",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38721,7 +38889,7 @@ static PyObject *_wrap_wxSizerItem_GetMinSizeWithBorder(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_wxSizerItem_SetInitSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetInitSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int arg2 ;
@@ -38733,7 +38901,7 @@ static PyObject *_wrap_wxSizerItem_SetInitSize(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxSizerItem_SetInitSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SizerItem_SetInitSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38758,7 +38926,7 @@ static PyObject *_wrap_wxSizerItem_SetInitSize(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxSizerItem_SetRatioWH(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetRatioWH(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int arg2 ;
@@ -38770,7 +38938,7 @@ static PyObject *_wrap_wxSizerItem_SetRatioWH(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxSizerItem_SetRatioWH",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SizerItem_SetRatioWH",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38795,7 +38963,7 @@ static PyObject *_wrap_wxSizerItem_SetRatioWH(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxSizerItem_SetRatioSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize *arg2 = 0 ;
@@ -38806,7 +38974,7 @@ static PyObject *_wrap_wxSizerItem_SetRatioSize(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "size", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizerItem_SetRatioSize",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetRatioSize",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38827,7 +38995,7 @@ static PyObject *_wrap_wxSizerItem_SetRatioSize(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxSizerItem_SetRatio(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetRatio(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     float arg2 ;
@@ -38837,7 +39005,7 @@ static PyObject *_wrap_wxSizerItem_SetRatio(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "ratio", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizerItem_SetRatio",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetRatio",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38858,7 +39026,7 @@ static PyObject *_wrap_wxSizerItem_SetRatio(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizerItem_GetRatio(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetRatio(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     float result;
@@ -38867,7 +39035,7 @@ static PyObject *_wrap_wxSizerItem_GetRatio(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_GetRatio",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetRatio",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38886,7 +39054,7 @@ static PyObject *_wrap_wxSizerItem_GetRatio(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizerItem_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxRect result;
@@ -38895,7 +39063,7 @@ static PyObject *_wrap_wxSizerItem_GetRect(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_GetRect",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetRect",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38916,7 +39084,7 @@ static PyObject *_wrap_wxSizerItem_GetRect(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizerItem_IsWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_IsWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     bool result;
@@ -38925,7 +39093,7 @@ static PyObject *_wrap_wxSizerItem_IsWindow(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_IsWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_IsWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38944,7 +39112,7 @@ static PyObject *_wrap_wxSizerItem_IsWindow(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizerItem_IsSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_IsSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     bool result;
@@ -38953,7 +39121,7 @@ static PyObject *_wrap_wxSizerItem_IsSizer(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_IsSizer",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_IsSizer",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -38972,7 +39140,7 @@ static PyObject *_wrap_wxSizerItem_IsSizer(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizerItem_IsSpacer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_IsSpacer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     bool result;
@@ -38981,7 +39149,7 @@ static PyObject *_wrap_wxSizerItem_IsSpacer(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_IsSpacer",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_IsSpacer",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39000,7 +39168,7 @@ static PyObject *_wrap_wxSizerItem_IsSpacer(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizerItem_SetProportion(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetProportion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int arg2 ;
@@ -39010,7 +39178,7 @@ static PyObject *_wrap_wxSizerItem_SetProportion(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "proportion", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizerItem_SetProportion",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetProportion",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39031,7 +39199,7 @@ static PyObject *_wrap_wxSizerItem_SetProportion(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxSizerItem_GetProportion(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetProportion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int result;
@@ -39040,7 +39208,7 @@ static PyObject *_wrap_wxSizerItem_GetProportion(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_GetProportion",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetProportion",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39059,7 +39227,7 @@ static PyObject *_wrap_wxSizerItem_GetProportion(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxSizerItem_SetFlag(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetFlag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int arg2 ;
@@ -39069,7 +39237,7 @@ static PyObject *_wrap_wxSizerItem_SetFlag(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "flag", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizerItem_SetFlag",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetFlag",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39090,7 +39258,7 @@ static PyObject *_wrap_wxSizerItem_SetFlag(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizerItem_GetFlag(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetFlag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int result;
@@ -39099,7 +39267,7 @@ static PyObject *_wrap_wxSizerItem_GetFlag(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_GetFlag",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetFlag",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39118,7 +39286,7 @@ static PyObject *_wrap_wxSizerItem_GetFlag(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizerItem_SetBorder(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetBorder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int arg2 ;
@@ -39128,7 +39296,7 @@ static PyObject *_wrap_wxSizerItem_SetBorder(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "border", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizerItem_SetBorder",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetBorder",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39149,7 +39317,7 @@ static PyObject *_wrap_wxSizerItem_SetBorder(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxSizerItem_GetBorder(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetBorder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int result;
@@ -39158,7 +39326,7 @@ static PyObject *_wrap_wxSizerItem_GetBorder(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_GetBorder",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetBorder",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39177,7 +39345,7 @@ static PyObject *_wrap_wxSizerItem_GetBorder(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxSizerItem_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxWindow *result;
@@ -39186,7 +39354,7 @@ static PyObject *_wrap_wxSizerItem_GetWindow(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_GetWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39205,7 +39373,7 @@ static PyObject *_wrap_wxSizerItem_GetWindow(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxSizerItem_SetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -39215,7 +39383,7 @@ static PyObject *_wrap_wxSizerItem_SetWindow(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "window", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizerItem_SetWindow",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetWindow",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -39234,7 +39402,7 @@ static PyObject *_wrap_wxSizerItem_SetWindow(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSizer *result;
@@ -39243,7 +39411,7 @@ static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_GetSizer",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetSizer",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39254,7 +39422,7 @@ static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *, PyObject *args, PyObject
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxSizer(result, 0); 
+        resultobj = wxPyMake_wxObject(result, 0); 
     }
     return resultobj;
     fail:
@@ -39262,7 +39430,7 @@ static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizerItem_SetSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -39272,7 +39440,7 @@ static PyObject *_wrap_wxSizerItem_SetSizer(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "sizer", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizerItem_SetSizer",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSizer",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
@@ -39291,7 +39459,7 @@ static PyObject *_wrap_wxSizerItem_SetSizer(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizerItem_GetSpacer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetSpacer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize *result;
@@ -39300,7 +39468,7 @@ static PyObject *_wrap_wxSizerItem_GetSpacer(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_GetSpacer",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetSpacer",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39320,7 +39488,7 @@ static PyObject *_wrap_wxSizerItem_GetSpacer(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxSizerItem_SetSpacer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetSpacer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize *arg2 = 0 ;
@@ -39331,7 +39499,7 @@ static PyObject *_wrap_wxSizerItem_SetSpacer(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "size", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizerItem_SetSpacer",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSpacer",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39352,7 +39520,7 @@ static PyObject *_wrap_wxSizerItem_SetSpacer(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxSizerItem_Show(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_Show(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     bool arg2 ;
@@ -39362,7 +39530,7 @@ static PyObject *_wrap_wxSizerItem_Show(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "show", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizerItem_Show",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_Show",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39383,7 +39551,7 @@ static PyObject *_wrap_wxSizerItem_Show(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxSizerItem_IsShown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_IsShown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     bool result;
@@ -39392,7 +39560,7 @@ static PyObject *_wrap_wxSizerItem_IsShown(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_IsShown",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_IsShown",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39411,7 +39579,7 @@ static PyObject *_wrap_wxSizerItem_IsShown(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizerItem_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxPoint result;
@@ -39420,7 +39588,7 @@ static PyObject *_wrap_wxSizerItem_GetPosition(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_GetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39441,7 +39609,7 @@ static PyObject *_wrap_wxSizerItem_GetPosition(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxSizerItem_GetUserData(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetUserData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     PyObject *result;
@@ -39450,7 +39618,7 @@ static PyObject *_wrap_wxSizerItem_GetUserData(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizerItem_GetUserData",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetUserData",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39467,14 +39635,14 @@ static PyObject *_wrap_wxSizerItem_GetUserData(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject * wxSizerItem_swigregister(PyObject *, PyObject *args) {
+static PyObject * SizerItem_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSizerItem, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxSizer__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -39484,7 +39652,7 @@ static PyObject *_wrap_wxSizer__setOORInfo(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "_self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizer__setOORInfo",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer__setOORInfo",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -39502,7 +39670,7 @@ static PyObject *_wrap_wxSizer__setOORInfo(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizer_Add(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Add(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -39521,7 +39689,7 @@ static PyObject *_wrap_wxSizer_Add(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "self",(char *) "item",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:wxSizer_Add",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Sizer_Add",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -39560,7 +39728,7 @@ static PyObject *_wrap_wxSizer_Add(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_wxSizer_Insert(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Insert(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     int arg2 ;
@@ -39581,7 +39749,7 @@ static PyObject *_wrap_wxSizer_Insert(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "before",(char *) "item",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:wxSizer_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Sizer_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39624,7 +39792,7 @@ static PyObject *_wrap_wxSizer_Insert(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxSizer_Prepend(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Prepend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -39643,7 +39811,7 @@ static PyObject *_wrap_wxSizer_Prepend(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "item",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:wxSizer_Prepend",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Sizer_Prepend",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -39682,7 +39850,7 @@ static PyObject *_wrap_wxSizer_Prepend(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxSizer_Remove(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Remove(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -39693,7 +39861,7 @@ static PyObject *_wrap_wxSizer_Remove(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizer_Remove",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_Remove",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -39713,7 +39881,7 @@ static PyObject *_wrap_wxSizer_Remove(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxSizer_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -39724,7 +39892,7 @@ static PyObject *_wrap_wxSizer_Detach(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizer_Detach",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_Detach",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -39744,7 +39912,7 @@ static PyObject *_wrap_wxSizer_Detach(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxSizer_GetItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_GetItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -39755,7 +39923,7 @@ static PyObject *_wrap_wxSizer_GetItem(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizer_GetItem",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_GetItem",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -39773,7 +39941,7 @@ static PyObject *_wrap_wxSizer_GetItem(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxSizer__SetItemMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer__SetItemMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -39786,7 +39954,7 @@ static PyObject *_wrap_wxSizer__SetItemMinSize(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "item",(char *) "size", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxSizer__SetItemMinSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer__SetItemMinSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -39808,7 +39976,7 @@ static PyObject *_wrap_wxSizer__SetItemMinSize(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxSizer_AddItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_AddItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxSizerItem *arg2 = (wxSizerItem *) 0 ;
@@ -39819,7 +39987,7 @@ static PyObject *_wrap_wxSizer_AddItem(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizer_AddItem",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_AddItem",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
@@ -39838,7 +40006,7 @@ static PyObject *_wrap_wxSizer_AddItem(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxSizer_InsertItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_InsertItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     size_t arg2 ;
@@ -39851,7 +40019,7 @@ static PyObject *_wrap_wxSizer_InsertItem(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "index",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxSizer_InsertItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_InsertItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39874,7 +40042,7 @@ static PyObject *_wrap_wxSizer_InsertItem(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxSizer_PrependItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_PrependItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxSizerItem *arg2 = (wxSizerItem *) 0 ;
@@ -39885,7 +40053,7 @@ static PyObject *_wrap_wxSizer_PrependItem(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizer_PrependItem",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_PrependItem",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
@@ -39904,7 +40072,7 @@ static PyObject *_wrap_wxSizer_PrependItem(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizer_SetDimension(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_SetDimension(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     int arg2 ;
@@ -39920,7 +40088,7 @@ static PyObject *_wrap_wxSizer_SetDimension(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:wxSizer_SetDimension",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Sizer_SetDimension",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39953,7 +40121,7 @@ static PyObject *_wrap_wxSizer_SetDimension(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizer_SetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_SetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxSize *arg2 = 0 ;
@@ -39964,7 +40132,7 @@ static PyObject *_wrap_wxSizer_SetMinSize(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "size", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizer_SetMinSize",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_SetMinSize",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -39985,7 +40153,7 @@ static PyObject *_wrap_wxSizer_SetMinSize(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxSizer_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxSize result;
@@ -39994,7 +40162,7 @@ static PyObject *_wrap_wxSizer_GetSize(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizer_GetSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_GetSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40015,7 +40183,7 @@ static PyObject *_wrap_wxSizer_GetSize(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxSizer_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxPoint result;
@@ -40024,7 +40192,7 @@ static PyObject *_wrap_wxSizer_GetPosition(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizer_GetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_GetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40045,7 +40213,7 @@ static PyObject *_wrap_wxSizer_GetPosition(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizer_GetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_GetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxSize result;
@@ -40054,7 +40222,7 @@ static PyObject *_wrap_wxSizer_GetMinSize(PyObject *, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizer_GetMinSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_GetMinSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40075,7 +40243,7 @@ static PyObject *_wrap_wxSizer_GetMinSize(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxSizer_RecalcSizes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_RecalcSizes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -40083,7 +40251,7 @@ static PyObject *_wrap_wxSizer_RecalcSizes(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizer_RecalcSizes",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_RecalcSizes",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40100,7 +40268,7 @@ static PyObject *_wrap_wxSizer_RecalcSizes(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizer_CalcMin(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_CalcMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxSize result;
@@ -40109,7 +40277,7 @@ static PyObject *_wrap_wxSizer_CalcMin(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizer_CalcMin",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_CalcMin",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40130,7 +40298,7 @@ static PyObject *_wrap_wxSizer_CalcMin(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxSizer_Layout(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Layout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -40138,7 +40306,7 @@ static PyObject *_wrap_wxSizer_Layout(PyObject *, PyObject *args, PyObject *kwar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizer_Layout",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_Layout",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40155,7 +40323,7 @@ static PyObject *_wrap_wxSizer_Layout(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxSizer_Fit(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Fit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -40166,7 +40334,7 @@ static PyObject *_wrap_wxSizer_Fit(PyObject *, PyObject *args, PyObject *kwargs)
         (char *) "self",(char *) "window", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizer_Fit",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_Fit",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -40189,7 +40357,7 @@ static PyObject *_wrap_wxSizer_Fit(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_wxSizer_FitInside(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_FitInside(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -40199,7 +40367,7 @@ static PyObject *_wrap_wxSizer_FitInside(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "window", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizer_FitInside",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_FitInside",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -40218,7 +40386,7 @@ static PyObject *_wrap_wxSizer_FitInside(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_wxSizer_SetSizeHints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_SetSizeHints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -40228,7 +40396,7 @@ static PyObject *_wrap_wxSizer_SetSizeHints(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "window", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizer_SetSizeHints",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_SetSizeHints",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -40247,7 +40415,7 @@ static PyObject *_wrap_wxSizer_SetSizeHints(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizer_SetVirtualSizeHints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_SetVirtualSizeHints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -40257,7 +40425,7 @@ static PyObject *_wrap_wxSizer_SetVirtualSizeHints(PyObject *, PyObject *args, P
         (char *) "self",(char *) "window", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizer_SetVirtualSizeHints",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_SetVirtualSizeHints",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -40276,7 +40444,7 @@ static PyObject *_wrap_wxSizer_SetVirtualSizeHints(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxSizer_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     bool arg2 = (bool) false ;
@@ -40286,7 +40454,7 @@ static PyObject *_wrap_wxSizer_Clear(PyObject *, PyObject *args, PyObject *kwarg
         (char *) "self",(char *) "deleteWindows", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:wxSizer_Clear",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Sizer_Clear",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -40309,7 +40477,7 @@ static PyObject *_wrap_wxSizer_Clear(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxSizer_DeleteWindows(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_DeleteWindows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -40317,7 +40485,7 @@ static PyObject *_wrap_wxSizer_DeleteWindows(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizer_DeleteWindows",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_DeleteWindows",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40334,7 +40502,7 @@ static PyObject *_wrap_wxSizer_DeleteWindows(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxSizer_GetChildren(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_GetChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *result;
@@ -40343,7 +40511,7 @@ static PyObject *_wrap_wxSizer_GetChildren(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxSizer_GetChildren",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_GetChildren",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40360,7 +40528,7 @@ static PyObject *_wrap_wxSizer_GetChildren(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxSizer_Show(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Show(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -40375,7 +40543,7 @@ static PyObject *_wrap_wxSizer_Show(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self",(char *) "item",(char *) "show",(char *) "recursive", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:wxSizer_Show",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Sizer_Show",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -40407,7 +40575,7 @@ static PyObject *_wrap_wxSizer_Show(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxSizer_IsShown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_IsShown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -40418,7 +40586,7 @@ static PyObject *_wrap_wxSizer_IsShown(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizer_IsShown",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_IsShown",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -40438,7 +40606,7 @@ static PyObject *_wrap_wxSizer_IsShown(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxSizer_ShowItems(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_ShowItems(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     bool arg2 ;
@@ -40448,7 +40616,7 @@ static PyObject *_wrap_wxSizer_ShowItems(PyObject *, PyObject *args, PyObject *k
         (char *) "self",(char *) "show", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxSizer_ShowItems",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_ShowItems",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40469,21 +40637,21 @@ static PyObject *_wrap_wxSizer_ShowItems(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject * wxSizer_swigregister(PyObject *, PyObject *args) {
+static PyObject * Sizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxPySizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PySizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPySizer *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxPySizer",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PySizer",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPySizer *)new wxPySizer();
@@ -40498,7 +40666,7 @@ static PyObject *_wrap_new_wxPySizer(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_wxPySizer__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PySizer__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPySizer *arg1 = (wxPySizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -40510,7 +40678,7 @@ static PyObject *_wrap_wxPySizer__setCallbackInfo(PyObject *, PyObject *args, Py
         (char *) "self",(char *) "self",(char *) "_class", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxPySizer__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PySizer__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPySizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -40529,14 +40697,14 @@ static PyObject *_wrap_wxPySizer__setCallbackInfo(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject * wxPySizer_swigregister(PyObject *, PyObject *args) {
+static PyObject * PySizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPySizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxBoxSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BoxSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxHORIZONTAL ;
     wxBoxSizer *result;
@@ -40545,7 +40713,7 @@ static PyObject *_wrap_new_wxBoxSizer(PyObject *, PyObject *args, PyObject *kwar
         (char *) "orient", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_wxBoxSizer",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_BoxSizer",kwnames,&obj0)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -40566,7 +40734,7 @@ static PyObject *_wrap_new_wxBoxSizer(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_wxBoxSizer_GetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BoxSizer_GetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBoxSizer *arg1 = (wxBoxSizer *) 0 ;
     int result;
@@ -40575,7 +40743,7 @@ static PyObject *_wrap_wxBoxSizer_GetOrientation(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxBoxSizer_GetOrientation",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BoxSizer_GetOrientation",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBoxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40594,7 +40762,7 @@ static PyObject *_wrap_wxBoxSizer_GetOrientation(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_wxBoxSizer_SetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BoxSizer_SetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBoxSizer *arg1 = (wxBoxSizer *) 0 ;
     int arg2 ;
@@ -40604,7 +40772,7 @@ static PyObject *_wrap_wxBoxSizer_SetOrientation(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "orient", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxBoxSizer_SetOrientation",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BoxSizer_SetOrientation",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBoxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40625,14 +40793,14 @@ static PyObject *_wrap_wxBoxSizer_SetOrientation(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject * wxBoxSizer_swigregister(PyObject *, PyObject *args) {
+static PyObject * BoxSizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBoxSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxStaticBoxSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_StaticBoxSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticBox *arg1 = (wxStaticBox *) 0 ;
     int arg2 = (int) wxHORIZONTAL ;
@@ -40643,7 +40811,7 @@ static PyObject *_wrap_new_wxStaticBoxSizer(PyObject *, PyObject *args, PyObject
         (char *) "box",(char *) "orient", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_wxStaticBoxSizer",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_StaticBoxSizer",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStaticBox, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -40666,7 +40834,7 @@ static PyObject *_wrap_new_wxStaticBoxSizer(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxStaticBoxSizer_GetStaticBox(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticBoxSizer_GetStaticBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticBoxSizer *arg1 = (wxStaticBoxSizer *) 0 ;
     wxStaticBox *result;
@@ -40675,7 +40843,7 @@ static PyObject *_wrap_wxStaticBoxSizer_GetStaticBox(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxStaticBoxSizer_GetStaticBox",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StaticBoxSizer_GetStaticBox",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStaticBoxSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40694,14 +40862,14 @@ static PyObject *_wrap_wxStaticBoxSizer_GetStaticBox(PyObject *, PyObject *args,
 }
 
 
-static PyObject * wxStaticBoxSizer_swigregister(PyObject *, PyObject *args) {
+static PyObject * StaticBoxSizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxStaticBoxSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxGridSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 1 ;
     int arg2 = (int) 0 ;
@@ -40716,7 +40884,7 @@ static PyObject *_wrap_new_wxGridSizer(PyObject *, PyObject *args, PyObject *kwa
         (char *) "rows",(char *) "cols",(char *) "vgap",(char *) "hgap", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_wxGridSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_GridSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -40755,7 +40923,7 @@ static PyObject *_wrap_new_wxGridSizer(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxGridSizer_SetCols(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_SetCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int arg2 ;
@@ -40765,7 +40933,7 @@ static PyObject *_wrap_wxGridSizer_SetCols(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "cols", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGridSizer_SetCols",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetCols",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40786,7 +40954,7 @@ static PyObject *_wrap_wxGridSizer_SetCols(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGridSizer_SetRows(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_SetRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int arg2 ;
@@ -40796,7 +40964,7 @@ static PyObject *_wrap_wxGridSizer_SetRows(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "rows", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGridSizer_SetRows",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetRows",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40817,7 +40985,7 @@ static PyObject *_wrap_wxGridSizer_SetRows(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGridSizer_SetVGap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_SetVGap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int arg2 ;
@@ -40827,7 +40995,7 @@ static PyObject *_wrap_wxGridSizer_SetVGap(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "gap", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGridSizer_SetVGap",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetVGap",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40848,7 +41016,7 @@ static PyObject *_wrap_wxGridSizer_SetVGap(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGridSizer_SetHGap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_SetHGap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int arg2 ;
@@ -40858,7 +41026,7 @@ static PyObject *_wrap_wxGridSizer_SetHGap(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "gap", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGridSizer_SetHGap",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetHGap",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40879,7 +41047,7 @@ static PyObject *_wrap_wxGridSizer_SetHGap(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGridSizer_GetCols(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_GetCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int result;
@@ -40888,7 +41056,7 @@ static PyObject *_wrap_wxGridSizer_GetCols(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGridSizer_GetCols",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridSizer_GetCols",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40907,7 +41075,7 @@ static PyObject *_wrap_wxGridSizer_GetCols(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGridSizer_GetRows(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_GetRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int result;
@@ -40916,7 +41084,7 @@ static PyObject *_wrap_wxGridSizer_GetRows(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGridSizer_GetRows",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridSizer_GetRows",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40935,7 +41103,7 @@ static PyObject *_wrap_wxGridSizer_GetRows(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGridSizer_GetVGap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_GetVGap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int result;
@@ -40944,7 +41112,7 @@ static PyObject *_wrap_wxGridSizer_GetVGap(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGridSizer_GetVGap",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridSizer_GetVGap",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40963,7 +41131,7 @@ static PyObject *_wrap_wxGridSizer_GetVGap(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGridSizer_GetHGap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_GetHGap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int result;
@@ -40972,7 +41140,7 @@ static PyObject *_wrap_wxGridSizer_GetHGap(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGridSizer_GetHGap",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridSizer_GetHGap",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -40991,14 +41159,14 @@ static PyObject *_wrap_wxGridSizer_GetHGap(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject * wxGridSizer_swigregister(PyObject *, PyObject *args) {
+static PyObject * GridSizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxFlexGridSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FlexGridSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 1 ;
     int arg2 = (int) 0 ;
@@ -41013,7 +41181,7 @@ static PyObject *_wrap_new_wxFlexGridSizer(PyObject *, PyObject *args, PyObject
         (char *) "rows",(char *) "cols",(char *) "vgap",(char *) "hgap", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_wxFlexGridSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_FlexGridSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -41052,7 +41220,7 @@ static PyObject *_wrap_new_wxFlexGridSizer(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxFlexGridSizer_AddGrowableRow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_AddGrowableRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     size_t arg2 ;
@@ -41064,7 +41232,7 @@ static PyObject *_wrap_wxFlexGridSizer_AddGrowableRow(PyObject *, PyObject *args
         (char *) "self",(char *) "idx",(char *) "proportion", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxFlexGridSizer_AddGrowableRow",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FlexGridSizer_AddGrowableRow",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFlexGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41091,7 +41259,7 @@ static PyObject *_wrap_wxFlexGridSizer_AddGrowableRow(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxFlexGridSizer_RemoveGrowableRow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_RemoveGrowableRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     size_t arg2 ;
@@ -41101,7 +41269,7 @@ static PyObject *_wrap_wxFlexGridSizer_RemoveGrowableRow(PyObject *, PyObject *a
         (char *) "self",(char *) "idx", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxFlexGridSizer_RemoveGrowableRow",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_RemoveGrowableRow",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFlexGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41122,7 +41290,7 @@ static PyObject *_wrap_wxFlexGridSizer_RemoveGrowableRow(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxFlexGridSizer_AddGrowableCol(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_AddGrowableCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     size_t arg2 ;
@@ -41134,7 +41302,7 @@ static PyObject *_wrap_wxFlexGridSizer_AddGrowableCol(PyObject *, PyObject *args
         (char *) "self",(char *) "idx",(char *) "proportion", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxFlexGridSizer_AddGrowableCol",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FlexGridSizer_AddGrowableCol",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFlexGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41161,7 +41329,7 @@ static PyObject *_wrap_wxFlexGridSizer_AddGrowableCol(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxFlexGridSizer_RemoveGrowableCol(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_RemoveGrowableCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     size_t arg2 ;
@@ -41171,7 +41339,7 @@ static PyObject *_wrap_wxFlexGridSizer_RemoveGrowableCol(PyObject *, PyObject *a
         (char *) "self",(char *) "idx", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxFlexGridSizer_RemoveGrowableCol",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_RemoveGrowableCol",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFlexGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41192,7 +41360,7 @@ static PyObject *_wrap_wxFlexGridSizer_RemoveGrowableCol(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxFlexGridSizer_SetFlexibleDirection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_SetFlexibleDirection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     int arg2 ;
@@ -41202,7 +41370,7 @@ static PyObject *_wrap_wxFlexGridSizer_SetFlexibleDirection(PyObject *, PyObject
         (char *) "self",(char *) "direction", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxFlexGridSizer_SetFlexibleDirection",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_SetFlexibleDirection",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFlexGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41223,7 +41391,7 @@ static PyObject *_wrap_wxFlexGridSizer_SetFlexibleDirection(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxFlexGridSizer_GetFlexibleDirection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_GetFlexibleDirection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     int result;
@@ -41232,7 +41400,7 @@ static PyObject *_wrap_wxFlexGridSizer_GetFlexibleDirection(PyObject *, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFlexGridSizer_GetFlexibleDirection",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_GetFlexibleDirection",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFlexGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41251,7 +41419,7 @@ static PyObject *_wrap_wxFlexGridSizer_GetFlexibleDirection(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxFlexGridSizer_SetNonFlexibleGrowMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_SetNonFlexibleGrowMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     wxFlexSizerGrowMode arg2 ;
@@ -41261,7 +41429,7 @@ static PyObject *_wrap_wxFlexGridSizer_SetNonFlexibleGrowMode(PyObject *, PyObje
         (char *) "self",(char *) "mode", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxFlexGridSizer_SetNonFlexibleGrowMode",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_SetNonFlexibleGrowMode",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFlexGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41282,7 +41450,7 @@ static PyObject *_wrap_wxFlexGridSizer_SetNonFlexibleGrowMode(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxFlexGridSizer_GetNonFlexibleGrowMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_GetNonFlexibleGrowMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     wxFlexSizerGrowMode result;
@@ -41291,7 +41459,7 @@ static PyObject *_wrap_wxFlexGridSizer_GetNonFlexibleGrowMode(PyObject *, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFlexGridSizer_GetNonFlexibleGrowMode",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_GetNonFlexibleGrowMode",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFlexGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41308,7 +41476,7 @@ static PyObject *_wrap_wxFlexGridSizer_GetNonFlexibleGrowMode(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxFlexGridSizer_GetRowHeights(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_GetRowHeights(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     wxArrayInt *result;
@@ -41317,7 +41485,7 @@ static PyObject *_wrap_wxFlexGridSizer_GetRowHeights(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFlexGridSizer_GetRowHeights",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_GetRowHeights",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFlexGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41345,7 +41513,7 @@ static PyObject *_wrap_wxFlexGridSizer_GetRowHeights(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxFlexGridSizer_GetColWidths(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_GetColWidths(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     wxArrayInt *result;
@@ -41354,7 +41522,7 @@ static PyObject *_wrap_wxFlexGridSizer_GetColWidths(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxFlexGridSizer_GetColWidths",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_GetColWidths",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxFlexGridSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41382,21 +41550,21 @@ static PyObject *_wrap_wxFlexGridSizer_GetColWidths(PyObject *, PyObject *args,
 }
 
 
-static PyObject * wxFlexGridSizer_swigregister(PyObject *, PyObject *args) {
+static PyObject * FlexGridSizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFlexGridSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxStdDialogButtonSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_StdDialogButtonSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStdDialogButtonSizer *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxStdDialogButtonSizer",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_StdDialogButtonSizer",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxStdDialogButtonSizer *)new wxStdDialogButtonSizer();
@@ -41411,7 +41579,7 @@ static PyObject *_wrap_new_wxStdDialogButtonSizer(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxStdDialogButtonSizer_AddButton(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StdDialogButtonSizer_AddButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStdDialogButtonSizer *arg1 = (wxStdDialogButtonSizer *) 0 ;
     wxButton *arg2 = (wxButton *) 0 ;
@@ -41421,7 +41589,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_AddButton(PyObject *, PyObject *ar
         (char *) "self",(char *) "button", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxStdDialogButtonSizer_AddButton",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StdDialogButtonSizer_AddButton",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStdDialogButtonSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxButton, SWIG_POINTER_EXCEPTION | 0);
@@ -41440,7 +41608,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_AddButton(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_wxStdDialogButtonSizer_Realize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StdDialogButtonSizer_Realize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStdDialogButtonSizer *arg1 = (wxStdDialogButtonSizer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -41448,7 +41616,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_Realize(PyObject *, PyObject *args
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxStdDialogButtonSizer_Realize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StdDialogButtonSizer_Realize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStdDialogButtonSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41465,7 +41633,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_Realize(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxStdDialogButtonSizer_SetAffirmativeButton(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StdDialogButtonSizer_SetAffirmativeButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStdDialogButtonSizer *arg1 = (wxStdDialogButtonSizer *) 0 ;
     wxButton *arg2 = (wxButton *) 0 ;
@@ -41475,7 +41643,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_SetAffirmativeButton(PyObject *, P
         (char *) "self",(char *) "button", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxStdDialogButtonSizer_SetAffirmativeButton",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StdDialogButtonSizer_SetAffirmativeButton",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStdDialogButtonSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxButton, SWIG_POINTER_EXCEPTION | 0);
@@ -41494,7 +41662,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_SetAffirmativeButton(PyObject *, P
 }
 
 
-static PyObject *_wrap_wxStdDialogButtonSizer_SetNegativeButton(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StdDialogButtonSizer_SetNegativeButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStdDialogButtonSizer *arg1 = (wxStdDialogButtonSizer *) 0 ;
     wxButton *arg2 = (wxButton *) 0 ;
@@ -41504,7 +41672,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_SetNegativeButton(PyObject *, PyOb
         (char *) "self",(char *) "button", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxStdDialogButtonSizer_SetNegativeButton",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StdDialogButtonSizer_SetNegativeButton",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStdDialogButtonSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxButton, SWIG_POINTER_EXCEPTION | 0);
@@ -41523,7 +41691,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_SetNegativeButton(PyObject *, PyOb
 }
 
 
-static PyObject *_wrap_wxStdDialogButtonSizer_SetCancelButton(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StdDialogButtonSizer_SetCancelButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStdDialogButtonSizer *arg1 = (wxStdDialogButtonSizer *) 0 ;
     wxButton *arg2 = (wxButton *) 0 ;
@@ -41533,7 +41701,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_SetCancelButton(PyObject *, PyObje
         (char *) "self",(char *) "button", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxStdDialogButtonSizer_SetCancelButton",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StdDialogButtonSizer_SetCancelButton",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStdDialogButtonSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxButton, SWIG_POINTER_EXCEPTION | 0);
@@ -41552,7 +41720,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_SetCancelButton(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxStdDialogButtonSizer_GetAffirmativeButton(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StdDialogButtonSizer_GetAffirmativeButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStdDialogButtonSizer *arg1 = (wxStdDialogButtonSizer *) 0 ;
     wxButton *result;
@@ -41561,7 +41729,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_GetAffirmativeButton(PyObject *, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxStdDialogButtonSizer_GetAffirmativeButton",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StdDialogButtonSizer_GetAffirmativeButton",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStdDialogButtonSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41580,7 +41748,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_GetAffirmativeButton(PyObject *, P
 }
 
 
-static PyObject *_wrap_wxStdDialogButtonSizer_GetApplyButton(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StdDialogButtonSizer_GetApplyButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStdDialogButtonSizer *arg1 = (wxStdDialogButtonSizer *) 0 ;
     wxButton *result;
@@ -41589,7 +41757,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_GetApplyButton(PyObject *, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxStdDialogButtonSizer_GetApplyButton",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StdDialogButtonSizer_GetApplyButton",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStdDialogButtonSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41608,7 +41776,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_GetApplyButton(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_wxStdDialogButtonSizer_GetNegativeButton(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StdDialogButtonSizer_GetNegativeButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStdDialogButtonSizer *arg1 = (wxStdDialogButtonSizer *) 0 ;
     wxButton *result;
@@ -41617,7 +41785,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_GetNegativeButton(PyObject *, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxStdDialogButtonSizer_GetNegativeButton",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StdDialogButtonSizer_GetNegativeButton",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStdDialogButtonSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41636,7 +41804,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_GetNegativeButton(PyObject *, PyOb
 }
 
 
-static PyObject *_wrap_wxStdDialogButtonSizer_GetCancelButton(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StdDialogButtonSizer_GetCancelButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStdDialogButtonSizer *arg1 = (wxStdDialogButtonSizer *) 0 ;
     wxButton *result;
@@ -41645,7 +41813,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_GetCancelButton(PyObject *, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxStdDialogButtonSizer_GetCancelButton",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StdDialogButtonSizer_GetCancelButton",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStdDialogButtonSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41664,7 +41832,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_GetCancelButton(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxStdDialogButtonSizer_GetHelpButton(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StdDialogButtonSizer_GetHelpButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStdDialogButtonSizer *arg1 = (wxStdDialogButtonSizer *) 0 ;
     wxButton *result;
@@ -41673,7 +41841,7 @@ static PyObject *_wrap_wxStdDialogButtonSizer_GetHelpButton(PyObject *, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxStdDialogButtonSizer_GetHelpButton",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StdDialogButtonSizer_GetHelpButton",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStdDialogButtonSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41692,14 +41860,14 @@ static PyObject *_wrap_wxStdDialogButtonSizer_GetHelpButton(PyObject *, PyObject
 }
 
 
-static PyObject * wxStdDialogButtonSizer_swigregister(PyObject *, PyObject *args) {
+static PyObject * StdDialogButtonSizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxStdDialogButtonSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxGBPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GBPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -41710,7 +41878,7 @@ static PyObject *_wrap_new_wxGBPosition(PyObject *, PyObject *args, PyObject *kw
         (char *) "row",(char *) "col", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxGBPosition",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GBPosition",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -41737,7 +41905,7 @@ static PyObject *_wrap_new_wxGBPosition(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxGBPosition_GetRow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition_GetRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     int result;
@@ -41746,7 +41914,7 @@ static PyObject *_wrap_wxGBPosition_GetRow(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGBPosition_GetRow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBPosition_GetRow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBPosition, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41765,7 +41933,7 @@ static PyObject *_wrap_wxGBPosition_GetRow(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGBPosition_GetCol(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition_GetCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     int result;
@@ -41774,7 +41942,7 @@ static PyObject *_wrap_wxGBPosition_GetCol(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGBPosition_GetCol",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBPosition_GetCol",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBPosition, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41793,7 +41961,7 @@ static PyObject *_wrap_wxGBPosition_GetCol(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGBPosition_SetRow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition_SetRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     int arg2 ;
@@ -41803,7 +41971,7 @@ static PyObject *_wrap_wxGBPosition_SetRow(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "row", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGBPosition_SetRow",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition_SetRow",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBPosition, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41824,7 +41992,7 @@ static PyObject *_wrap_wxGBPosition_SetRow(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGBPosition_SetCol(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition_SetCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     int arg2 ;
@@ -41834,7 +42002,7 @@ static PyObject *_wrap_wxGBPosition_SetCol(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "col", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGBPosition_SetCol",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition_SetCol",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBPosition, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41855,7 +42023,7 @@ static PyObject *_wrap_wxGBPosition_SetCol(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGBPosition___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -41867,7 +42035,7 @@ static PyObject *_wrap_wxGBPosition___eq__(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "other", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGBPosition___eq__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition___eq__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBPosition, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41890,7 +42058,7 @@ static PyObject *_wrap_wxGBPosition___eq__(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGBPosition___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -41902,7 +42070,7 @@ static PyObject *_wrap_wxGBPosition___ne__(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "other", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGBPosition___ne__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition___ne__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBPosition, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41925,7 +42093,7 @@ static PyObject *_wrap_wxGBPosition___ne__(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGBPosition_Set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     int arg2 = (int) 0 ;
@@ -41937,7 +42105,7 @@ static PyObject *_wrap_wxGBPosition_Set(PyObject *, PyObject *args, PyObject *kw
         (char *) "self",(char *) "row",(char *) "col", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:wxGBPosition_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:GBPosition_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBPosition, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -41966,7 +42134,7 @@ static PyObject *_wrap_wxGBPosition_Set(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_wxGBPosition_Get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     PyObject *result;
@@ -41975,7 +42143,7 @@ static PyObject *_wrap_wxGBPosition_Get(PyObject *, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGBPosition_Get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBPosition_Get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBPosition, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -41992,14 +42160,14 @@ static PyObject *_wrap_wxGBPosition_Get(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * wxGBPosition_swigregister(PyObject *, PyObject *args) {
+static PyObject * GBPosition_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGBPosition, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxGBSpan(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GBSpan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 1 ;
     int arg2 = (int) 1 ;
@@ -42010,7 +42178,7 @@ static PyObject *_wrap_new_wxGBSpan(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "rowspan",(char *) "colspan", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxGBSpan",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GBSpan",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -42037,7 +42205,7 @@ static PyObject *_wrap_new_wxGBSpan(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxGBSpan_GetRowspan(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan_GetRowspan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     int result;
@@ -42046,7 +42214,7 @@ static PyObject *_wrap_wxGBSpan_GetRowspan(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGBSpan_GetRowspan",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSpan_GetRowspan",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSpan, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42065,7 +42233,7 @@ static PyObject *_wrap_wxGBSpan_GetRowspan(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGBSpan_GetColspan(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan_GetColspan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     int result;
@@ -42074,7 +42242,7 @@ static PyObject *_wrap_wxGBSpan_GetColspan(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGBSpan_GetColspan",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSpan_GetColspan",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSpan, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42093,7 +42261,7 @@ static PyObject *_wrap_wxGBSpan_GetColspan(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGBSpan_SetRowspan(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan_SetRowspan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     int arg2 ;
@@ -42103,7 +42271,7 @@ static PyObject *_wrap_wxGBSpan_SetRowspan(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "rowspan", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGBSpan_SetRowspan",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan_SetRowspan",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSpan, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42124,7 +42292,7 @@ static PyObject *_wrap_wxGBSpan_SetRowspan(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGBSpan_SetColspan(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan_SetColspan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     int arg2 ;
@@ -42134,7 +42302,7 @@ static PyObject *_wrap_wxGBSpan_SetColspan(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "colspan", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGBSpan_SetColspan",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan_SetColspan",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSpan, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42155,7 +42323,7 @@ static PyObject *_wrap_wxGBSpan_SetColspan(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGBSpan___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     wxGBSpan *arg2 = 0 ;
@@ -42167,7 +42335,7 @@ static PyObject *_wrap_wxGBSpan___eq__(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "other", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGBSpan___eq__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan___eq__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSpan, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42190,7 +42358,7 @@ static PyObject *_wrap_wxGBSpan___eq__(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxGBSpan___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     wxGBSpan *arg2 = 0 ;
@@ -42202,7 +42370,7 @@ static PyObject *_wrap_wxGBSpan___ne__(PyObject *, PyObject *args, PyObject *kwa
         (char *) "self",(char *) "other", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGBSpan___ne__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan___ne__",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSpan, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42225,7 +42393,7 @@ static PyObject *_wrap_wxGBSpan___ne__(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_wxGBSpan_Set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     int arg2 = (int) 1 ;
@@ -42237,7 +42405,7 @@ static PyObject *_wrap_wxGBSpan_Set(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self",(char *) "rowspan",(char *) "colspan", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:wxGBSpan_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:GBSpan_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSpan, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
@@ -42266,7 +42434,7 @@ static PyObject *_wrap_wxGBSpan_Set(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_wxGBSpan_Get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     PyObject *result;
@@ -42275,7 +42443,7 @@ static PyObject *_wrap_wxGBSpan_Get(PyObject *, PyObject *args, PyObject *kwargs
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGBSpan_Get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSpan_Get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSpan, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42292,20 +42460,20 @@ static PyObject *_wrap_wxGBSpan_Get(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject * wxGBSpan_swigregister(PyObject *, PyObject *args) {
+static PyObject * GBSpan_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGBSpan, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_wxDefaultSpan_set(PyObject *) {
-    PyErr_SetString(PyExc_TypeError,"Variable wxDefaultSpan is read-only.");
+static int _wrap_DefaultSpan_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable DefaultSpan is read-only.");
     return 1;
 }
 
 
-static PyObject *_wrap_wxDefaultSpan_get(void) {
+static PyObject *_wrap_DefaultSpan_get(void) {
     PyObject *pyobj;
     
     pyobj = SWIG_NewPointerObj((void *)(&wxDefaultSpan), SWIGTYPE_p_wxGBSpan, 0);
@@ -42313,14 +42481,14 @@ static PyObject *_wrap_wxDefaultSpan_get(void) {
 }
 
 
-static PyObject *_wrap_new_wxGBSizerItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GBSizerItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxGBSizerItem",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_GBSizerItem",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxGBSizerItem *)new wxGBSizerItem();
@@ -42514,7 +42682,7 @@ static PyObject *_wrap_new_GBSizerItemSpacer(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxGBSizerItem_GetPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_GetPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBPosition result;
@@ -42523,7 +42691,7 @@ static PyObject *_wrap_wxGBSizerItem_GetPos(PyObject *, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGBSizerItem_GetPos",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSizerItem_GetPos",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42544,7 +42712,7 @@ static PyObject *_wrap_wxGBSizerItem_GetPos(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGBSizerItem_GetSpan(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_GetSpan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBSpan result;
@@ -42553,7 +42721,7 @@ static PyObject *_wrap_wxGBSizerItem_GetSpan(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGBSizerItem_GetSpan",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSizerItem_GetSpan",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42574,7 +42742,7 @@ static PyObject *_wrap_wxGBSizerItem_GetSpan(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxGBSizerItem_SetPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_SetPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -42586,7 +42754,7 @@ static PyObject *_wrap_wxGBSizerItem_SetPos(PyObject *, PyObject *args, PyObject
         (char *) "self",(char *) "pos", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGBSizerItem_SetPos",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSizerItem_SetPos",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42609,7 +42777,7 @@ static PyObject *_wrap_wxGBSizerItem_SetPos(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_wxGBSizerItem_SetSpan(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_SetSpan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBSpan *arg2 = 0 ;
@@ -42621,7 +42789,7 @@ static PyObject *_wrap_wxGBSizerItem_SetSpan(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "span", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGBSizerItem_SetSpan",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSizerItem_SetSpan",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42644,7 +42812,7 @@ static PyObject *_wrap_wxGBSizerItem_SetSpan(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_wxGBSizerItem_Intersects(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_Intersects(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBSizerItem *arg2 = 0 ;
@@ -42655,7 +42823,7 @@ static PyObject *_wrap_wxGBSizerItem_Intersects(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "other", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGBSizerItem_Intersects",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSizerItem_Intersects",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42682,7 +42850,7 @@ static PyObject *_wrap_wxGBSizerItem_Intersects(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxGBSizerItem_IntersectsPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_IntersectsPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -42697,7 +42865,7 @@ static PyObject *_wrap_wxGBSizerItem_IntersectsPos(PyObject *, PyObject *args, P
         (char *) "self",(char *) "pos",(char *) "span", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxGBSizerItem_IntersectsPos",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GBSizerItem_IntersectsPos",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42724,7 +42892,7 @@ static PyObject *_wrap_wxGBSizerItem_IntersectsPos(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxGBSizerItem_GetEndPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_GetEndPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBPosition result;
@@ -42733,7 +42901,7 @@ static PyObject *_wrap_wxGBSizerItem_GetEndPos(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGBSizerItem_GetEndPos",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSizerItem_GetEndPos",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42754,7 +42922,7 @@ static PyObject *_wrap_wxGBSizerItem_GetEndPos(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxGBSizerItem_GetGBSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_GetGBSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGridBagSizer *result;
@@ -42763,7 +42931,7 @@ static PyObject *_wrap_wxGBSizerItem_GetGBSizer(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGBSizerItem_GetGBSizer",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSizerItem_GetGBSizer",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42780,7 +42948,7 @@ static PyObject *_wrap_wxGBSizerItem_GetGBSizer(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_wxGBSizerItem_SetGBSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_SetGBSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGridBagSizer *arg2 = (wxGridBagSizer *) 0 ;
@@ -42790,7 +42958,7 @@ static PyObject *_wrap_wxGBSizerItem_SetGBSizer(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "sizer", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGBSizerItem_SetGBSizer",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSizerItem_SetGBSizer",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
@@ -42809,14 +42977,14 @@ static PyObject *_wrap_wxGBSizerItem_SetGBSizer(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject * wxGBSizerItem_swigregister(PyObject *, PyObject *args) {
+static PyObject * GBSizerItem_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGBSizerItem, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_wxGridBagSizer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridBagSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -42827,7 +42995,7 @@ static PyObject *_wrap_new_wxGridBagSizer(PyObject *, PyObject *args, PyObject *
         (char *) "vgap",(char *) "hgap", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_wxGridBagSizer",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridBagSizer",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
         {
             arg1 = (int)(SWIG_As_int(obj0)); 
@@ -42854,7 +43022,7 @@ static PyObject *_wrap_new_wxGridBagSizer(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_Add(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_Add(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -42878,7 +43046,7 @@ static PyObject *_wrap_wxGridBagSizer_Add(PyObject *, PyObject *args, PyObject *
         (char *) "self",(char *) "item",(char *) "pos",(char *) "span",(char *) "flag",(char *) "border",(char *) "userData", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:wxGridBagSizer_Add",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:GridBagSizer_Add",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     arg2 = obj1;
@@ -42921,7 +43089,7 @@ static PyObject *_wrap_wxGridBagSizer_Add(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_AddItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_AddItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxGBSizerItem *arg2 = (wxGBSizerItem *) 0 ;
@@ -42932,7 +43100,7 @@ static PyObject *_wrap_wxGridBagSizer_AddItem(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "item", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGridBagSizer_AddItem",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_AddItem",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0);
@@ -42951,7 +43119,7 @@ static PyObject *_wrap_wxGridBagSizer_AddItem(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_GetCellSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_GetCellSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     int arg2 ;
@@ -42964,7 +43132,7 @@ static PyObject *_wrap_wxGridBagSizer_GetCellSize(PyObject *, PyObject *args, Py
         (char *) "self",(char *) "row",(char *) "col", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxGridBagSizer_GetCellSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridBagSizer_GetCellSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -42993,7 +43161,7 @@ static PyObject *_wrap_wxGridBagSizer_GetCellSize(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_GetEmptyCellSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_GetEmptyCellSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSize result;
@@ -43002,7 +43170,7 @@ static PyObject *_wrap_wxGridBagSizer_GetEmptyCellSize(PyObject *, PyObject *arg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGridBagSizer_GetEmptyCellSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridBagSizer_GetEmptyCellSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -43023,7 +43191,7 @@ static PyObject *_wrap_wxGridBagSizer_GetEmptyCellSize(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_SetEmptyCellSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_SetEmptyCellSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSize *arg2 = 0 ;
@@ -43034,7 +43202,7 @@ static PyObject *_wrap_wxGridBagSizer_SetEmptyCellSize(PyObject *, PyObject *arg
         (char *) "self",(char *) "sz", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGridBagSizer_SetEmptyCellSize",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_SetEmptyCellSize",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -43055,7 +43223,7 @@ static PyObject *_wrap_wxGridBagSizer_SetEmptyCellSize(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_GetItemPosition__SWIG_0(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -43063,7 +43231,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemPosition__SWIG_0(PyObject *, PyObje
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OO:wxGridBagSizer_GetItemPosition",&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemPosition",&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -43086,7 +43254,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemPosition__SWIG_0(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_GetItemPosition__SWIG_1(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -43094,7 +43262,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemPosition__SWIG_1(PyObject *, PyObje
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OO:wxGridBagSizer_GetItemPosition",&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemPosition",&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
@@ -43117,7 +43285,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemPosition__SWIG_1(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_GetItemPosition__SWIG_2(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_2(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     size_t arg2 ;
@@ -43125,7 +43293,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemPosition__SWIG_2(PyObject *, PyObje
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OO:wxGridBagSizer_GetItemPosition",&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemPosition",&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -43150,7 +43318,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemPosition__SWIG_2(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_GetItemPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemPosition(PyObject *self, PyObject *args) {
     int argc;
     PyObject *argv[3];
     int ii;
@@ -43181,7 +43349,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemPosition(PyObject *self, PyObject *
                 }
             }
             if (_v) {
-                return _wrap_wxGridBagSizer_GetItemPosition__SWIG_0(self,args);
+                return _wrap_GridBagSizer_GetItemPosition__SWIG_0(self,args);
             }
         }
     }
@@ -43207,7 +43375,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemPosition(PyObject *self, PyObject *
                 }
             }
             if (_v) {
-                return _wrap_wxGridBagSizer_GetItemPosition__SWIG_1(self,args);
+                return _wrap_GridBagSizer_GetItemPosition__SWIG_1(self,args);
             }
         }
     }
@@ -43225,17 +43393,17 @@ static PyObject *_wrap_wxGridBagSizer_GetItemPosition(PyObject *self, PyObject *
         if (_v) {
             _v = SWIG_Check_unsigned_SS_long(argv[1]);
             if (_v) {
-                return _wrap_wxGridBagSizer_GetItemPosition__SWIG_2(self,args);
+                return _wrap_GridBagSizer_GetItemPosition__SWIG_2(self,args);
             }
         }
     }
     
-    PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'wxGridBagSizer_GetItemPosition'");
+    PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'GridBagSizer_GetItemPosition'");
     return NULL;
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_SetItemPosition__SWIG_0(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -43246,7 +43414,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemPosition__SWIG_0(PyObject *, PyObje
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OOO:wxGridBagSizer_SetItemPosition",&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemPosition",&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -43271,7 +43439,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemPosition__SWIG_0(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_SetItemPosition__SWIG_1(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -43282,7 +43450,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemPosition__SWIG_1(PyObject *, PyObje
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OOO:wxGridBagSizer_SetItemPosition",&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemPosition",&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
@@ -43307,7 +43475,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemPosition__SWIG_1(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_SetItemPosition__SWIG_2(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_2(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     size_t arg2 ;
@@ -43318,7 +43486,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemPosition__SWIG_2(PyObject *, PyObje
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OOO:wxGridBagSizer_SetItemPosition",&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemPosition",&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -43345,7 +43513,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemPosition__SWIG_2(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_SetItemPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemPosition(PyObject *self, PyObject *args) {
     int argc;
     PyObject *argv[4];
     int ii;
@@ -43380,7 +43548,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemPosition(PyObject *self, PyObject *
                     _v = wxPySimple_typecheck(argv[2], wxT("wxGBPosition"), 2);
                 }
                 if (_v) {
-                    return _wrap_wxGridBagSizer_SetItemPosition__SWIG_0(self,args);
+                    return _wrap_GridBagSizer_SetItemPosition__SWIG_0(self,args);
                 }
             }
         }
@@ -43411,7 +43579,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemPosition(PyObject *self, PyObject *
                     _v = wxPySimple_typecheck(argv[2], wxT("wxGBPosition"), 2);
                 }
                 if (_v) {
-                    return _wrap_wxGridBagSizer_SetItemPosition__SWIG_1(self,args);
+                    return _wrap_GridBagSizer_SetItemPosition__SWIG_1(self,args);
                 }
             }
         }
@@ -43434,18 +43602,18 @@ static PyObject *_wrap_wxGridBagSizer_SetItemPosition(PyObject *self, PyObject *
                     _v = wxPySimple_typecheck(argv[2], wxT("wxGBPosition"), 2);
                 }
                 if (_v) {
-                    return _wrap_wxGridBagSizer_SetItemPosition__SWIG_2(self,args);
+                    return _wrap_GridBagSizer_SetItemPosition__SWIG_2(self,args);
                 }
             }
         }
     }
     
-    PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'wxGridBagSizer_SetItemPosition'");
+    PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'GridBagSizer_SetItemPosition'");
     return NULL;
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_GetItemSpan__SWIG_0(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -43453,7 +43621,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemSpan__SWIG_0(PyObject *, PyObject *
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OO:wxGridBagSizer_GetItemSpan",&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemSpan",&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -43476,7 +43644,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemSpan__SWIG_0(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_GetItemSpan__SWIG_1(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -43484,7 +43652,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemSpan__SWIG_1(PyObject *, PyObject *
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OO:wxGridBagSizer_GetItemSpan",&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemSpan",&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
@@ -43507,7 +43675,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemSpan__SWIG_1(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_GetItemSpan__SWIG_2(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_2(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     size_t arg2 ;
@@ -43515,7 +43683,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemSpan__SWIG_2(PyObject *, PyObject *
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OO:wxGridBagSizer_GetItemSpan",&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemSpan",&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -43540,7 +43708,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemSpan__SWIG_2(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_GetItemSpan(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemSpan(PyObject *self, PyObject *args) {
     int argc;
     PyObject *argv[3];
     int ii;
@@ -43571,7 +43739,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemSpan(PyObject *self, PyObject *args
                 }
             }
             if (_v) {
-                return _wrap_wxGridBagSizer_GetItemSpan__SWIG_0(self,args);
+                return _wrap_GridBagSizer_GetItemSpan__SWIG_0(self,args);
             }
         }
     }
@@ -43597,7 +43765,7 @@ static PyObject *_wrap_wxGridBagSizer_GetItemSpan(PyObject *self, PyObject *args
                 }
             }
             if (_v) {
-                return _wrap_wxGridBagSizer_GetItemSpan__SWIG_1(self,args);
+                return _wrap_GridBagSizer_GetItemSpan__SWIG_1(self,args);
             }
         }
     }
@@ -43615,17 +43783,17 @@ static PyObject *_wrap_wxGridBagSizer_GetItemSpan(PyObject *self, PyObject *args
         if (_v) {
             _v = SWIG_Check_unsigned_SS_long(argv[1]);
             if (_v) {
-                return _wrap_wxGridBagSizer_GetItemSpan__SWIG_2(self,args);
+                return _wrap_GridBagSizer_GetItemSpan__SWIG_2(self,args);
             }
         }
     }
     
-    PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'wxGridBagSizer_GetItemSpan'");
+    PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'GridBagSizer_GetItemSpan'");
     return NULL;
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_SetItemSpan__SWIG_0(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -43636,7 +43804,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemSpan__SWIG_0(PyObject *, PyObject *
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OOO:wxGridBagSizer_SetItemSpan",&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemSpan",&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -43661,7 +43829,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemSpan__SWIG_0(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_SetItemSpan__SWIG_1(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -43672,7 +43840,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemSpan__SWIG_1(PyObject *, PyObject *
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OOO:wxGridBagSizer_SetItemSpan",&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemSpan",&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
@@ -43697,7 +43865,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemSpan__SWIG_1(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_SetItemSpan__SWIG_2(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_2(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     size_t arg2 ;
@@ -43708,7 +43876,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemSpan__SWIG_2(PyObject *, PyObject *
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OOO:wxGridBagSizer_SetItemSpan",&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemSpan",&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -43735,7 +43903,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemSpan__SWIG_2(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_SetItemSpan(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemSpan(PyObject *self, PyObject *args) {
     int argc;
     PyObject *argv[4];
     int ii;
@@ -43770,7 +43938,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemSpan(PyObject *self, PyObject *args
                     _v = wxPySimple_typecheck(argv[2], wxT("wxGBSpan"), 2);
                 }
                 if (_v) {
-                    return _wrap_wxGridBagSizer_SetItemSpan__SWIG_0(self,args);
+                    return _wrap_GridBagSizer_SetItemSpan__SWIG_0(self,args);
                 }
             }
         }
@@ -43801,7 +43969,7 @@ static PyObject *_wrap_wxGridBagSizer_SetItemSpan(PyObject *self, PyObject *args
                     _v = wxPySimple_typecheck(argv[2], wxT("wxGBSpan"), 2);
                 }
                 if (_v) {
-                    return _wrap_wxGridBagSizer_SetItemSpan__SWIG_1(self,args);
+                    return _wrap_GridBagSizer_SetItemSpan__SWIG_1(self,args);
                 }
             }
         }
@@ -43824,18 +43992,18 @@ static PyObject *_wrap_wxGridBagSizer_SetItemSpan(PyObject *self, PyObject *args
                     _v = wxPySimple_typecheck(argv[2], wxT("wxGBSpan"), 2);
                 }
                 if (_v) {
-                    return _wrap_wxGridBagSizer_SetItemSpan__SWIG_2(self,args);
+                    return _wrap_GridBagSizer_SetItemSpan__SWIG_2(self,args);
                 }
             }
         }
     }
     
-    PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'wxGridBagSizer_SetItemSpan'");
+    PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'GridBagSizer_SetItemSpan'");
     return NULL;
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_FindItem__SWIG_0(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_FindItem__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -43843,7 +44011,7 @@ static PyObject *_wrap_wxGridBagSizer_FindItem__SWIG_0(PyObject *, PyObject *arg
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OO:wxGridBagSizer_FindItem",&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_FindItem",&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -43862,7 +44030,7 @@ static PyObject *_wrap_wxGridBagSizer_FindItem__SWIG_0(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_FindItem__SWIG_1(PyObject *, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_FindItem__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -43870,7 +44038,7 @@ static PyObject *_wrap_wxGridBagSizer_FindItem__SWIG_1(PyObject *, PyObject *arg
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OO:wxGridBagSizer_FindItem",&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_FindItem",&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0);
@@ -43889,7 +44057,7 @@ static PyObject *_wrap_wxGridBagSizer_FindItem__SWIG_1(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_FindItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_FindItem(PyObject *self, PyObject *args) {
     int argc;
     PyObject *argv[3];
     int ii;
@@ -43920,7 +44088,7 @@ static PyObject *_wrap_wxGridBagSizer_FindItem(PyObject *self, PyObject *args) {
                 }
             }
             if (_v) {
-                return _wrap_wxGridBagSizer_FindItem__SWIG_0(self,args);
+                return _wrap_GridBagSizer_FindItem__SWIG_0(self,args);
             }
         }
     }
@@ -43946,17 +44114,17 @@ static PyObject *_wrap_wxGridBagSizer_FindItem(PyObject *self, PyObject *args) {
                 }
             }
             if (_v) {
-                return _wrap_wxGridBagSizer_FindItem__SWIG_1(self,args);
+                return _wrap_GridBagSizer_FindItem__SWIG_1(self,args);
             }
         }
     }
     
-    PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'wxGridBagSizer_FindItem'");
+    PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'GridBagSizer_FindItem'");
     return NULL;
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_FindItemAtPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_FindItemAtPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -43968,7 +44136,7 @@ static PyObject *_wrap_wxGridBagSizer_FindItemAtPosition(PyObject *, PyObject *a
         (char *) "self",(char *) "pos", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGridBagSizer_FindItemAtPosition",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_FindItemAtPosition",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -43989,7 +44157,7 @@ static PyObject *_wrap_wxGridBagSizer_FindItemAtPosition(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_FindItemAtPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_FindItemAtPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -44001,7 +44169,7 @@ static PyObject *_wrap_wxGridBagSizer_FindItemAtPoint(PyObject *, PyObject *args
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxGridBagSizer_FindItemAtPoint",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_FindItemAtPoint",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44022,7 +44190,7 @@ static PyObject *_wrap_wxGridBagSizer_FindItemAtPoint(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_CheckForIntersection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_CheckForIntersection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxGBSizerItem *arg2 = (wxGBSizerItem *) 0 ;
@@ -44035,7 +44203,7 @@ static PyObject *_wrap_wxGridBagSizer_CheckForIntersection(PyObject *, PyObject
         (char *) "self",(char *) "item",(char *) "excludeItem", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxGridBagSizer_CheckForIntersection",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:GridBagSizer_CheckForIntersection",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0);
@@ -44060,7 +44228,7 @@ static PyObject *_wrap_wxGridBagSizer_CheckForIntersection(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxGridBagSizer_CheckForIntersectionPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_CheckForIntersectionPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -44077,7 +44245,7 @@ static PyObject *_wrap_wxGridBagSizer_CheckForIntersectionPos(PyObject *, PyObje
         (char *) "self",(char *) "pos",(char *) "span",(char *) "excludeItem", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:wxGridBagSizer_CheckForIntersectionPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:GridBagSizer_CheckForIntersectionPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44108,14 +44276,14 @@ static PyObject *_wrap_wxGridBagSizer_CheckForIntersectionPos(PyObject *, PyObje
 }
 
 
-static PyObject * wxGridBagSizer_swigregister(PyObject *, PyObject *args) {
+static PyObject * GridBagSizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridBagSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxIndividualLayoutConstraint_Set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxRelationship arg2 ;
@@ -44133,7 +44301,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Set(PyObject *, PyObject *ar
         (char *) "self",(char *) "rel",(char *) "otherW",(char *) "otherE",(char *) "val",(char *) "marg", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:wxIndividualLayoutConstraint_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:IndividualLayoutConstraint_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44172,7 +44340,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Set(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_LeftOf(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_LeftOf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -44184,7 +44352,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_LeftOf(PyObject *, PyObject
         (char *) "self",(char *) "sibling",(char *) "marg", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxIndividualLayoutConstraint_LeftOf",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_LeftOf",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -44209,7 +44377,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_LeftOf(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_RightOf(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_RightOf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -44221,7 +44389,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_RightOf(PyObject *, PyObject
         (char *) "self",(char *) "sibling",(char *) "marg", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxIndividualLayoutConstraint_RightOf",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_RightOf",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -44246,7 +44414,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_RightOf(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_Above(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_Above(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -44258,7 +44426,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Above(PyObject *, PyObject *
         (char *) "self",(char *) "sibling",(char *) "marg", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxIndividualLayoutConstraint_Above",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_Above",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -44283,7 +44451,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Above(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_Below(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_Below(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -44295,7 +44463,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Below(PyObject *, PyObject *
         (char *) "self",(char *) "sibling",(char *) "marg", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:wxIndividualLayoutConstraint_Below",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_Below",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -44320,7 +44488,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Below(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_SameAs(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SameAs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -44334,7 +44502,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SameAs(PyObject *, PyObject
         (char *) "self",(char *) "otherW",(char *) "edge",(char *) "marg", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:wxIndividualLayoutConstraint_SameAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:IndividualLayoutConstraint_SameAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -44363,7 +44531,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SameAs(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_PercentOf(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_PercentOf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -44377,7 +44545,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_PercentOf(PyObject *, PyObje
         (char *) "self",(char *) "otherW",(char *) "wh",(char *) "per", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxIndividualLayoutConstraint_PercentOf",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:IndividualLayoutConstraint_PercentOf",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -44404,7 +44572,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_PercentOf(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_Absolute(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_Absolute(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int arg2 ;
@@ -44414,7 +44582,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Absolute(PyObject *, PyObjec
         (char *) "self",(char *) "val", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxIndividualLayoutConstraint_Absolute",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_Absolute",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44435,7 +44603,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Absolute(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_Unconstrained(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_Unconstrained(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     PyObject * obj0 = 0 ;
@@ -44443,7 +44611,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Unconstrained(PyObject *, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIndividualLayoutConstraint_Unconstrained",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_Unconstrained",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44460,7 +44628,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Unconstrained(PyObject *, Py
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_AsIs(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_AsIs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     PyObject * obj0 = 0 ;
@@ -44468,7 +44636,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_AsIs(PyObject *, PyObject *a
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIndividualLayoutConstraint_AsIs",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_AsIs",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44485,7 +44653,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_AsIs(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_GetOtherWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetOtherWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *result;
@@ -44494,7 +44662,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetOtherWindow(PyObject *, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIndividualLayoutConstraint_GetOtherWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetOtherWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44513,7 +44681,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetOtherWindow(PyObject *, P
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_GetMyEdge(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetMyEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxEdge result;
@@ -44522,7 +44690,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetMyEdge(PyObject *, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIndividualLayoutConstraint_GetMyEdge",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetMyEdge",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44539,7 +44707,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetMyEdge(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_SetEdge(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SetEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxEdge arg2 ;
@@ -44549,7 +44717,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SetEdge(PyObject *, PyObject
         (char *) "self",(char *) "which", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxIndividualLayoutConstraint_SetEdge",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetEdge",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44570,7 +44738,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SetEdge(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int arg2 ;
@@ -44580,7 +44748,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SetValue(PyObject *, PyObjec
         (char *) "self",(char *) "v", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxIndividualLayoutConstraint_SetValue",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetValue",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44601,7 +44769,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SetValue(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_GetMargin(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetMargin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int result;
@@ -44610,7 +44778,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetMargin(PyObject *, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIndividualLayoutConstraint_GetMargin",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetMargin",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44629,7 +44797,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetMargin(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_SetMargin(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SetMargin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int arg2 ;
@@ -44639,7 +44807,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SetMargin(PyObject *, PyObje
         (char *) "self",(char *) "m", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxIndividualLayoutConstraint_SetMargin",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetMargin",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44660,7 +44828,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SetMargin(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int result;
@@ -44669,7 +44837,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetValue(PyObject *, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIndividualLayoutConstraint_GetValue",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetValue",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44688,7 +44856,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetValue(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_GetPercent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetPercent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int result;
@@ -44697,7 +44865,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetPercent(PyObject *, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIndividualLayoutConstraint_GetPercent",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetPercent",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44716,7 +44884,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetPercent(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_GetOtherEdge(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetOtherEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int result;
@@ -44725,7 +44893,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetOtherEdge(PyObject *, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIndividualLayoutConstraint_GetOtherEdge",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetOtherEdge",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44744,7 +44912,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetOtherEdge(PyObject *, PyO
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_GetDone(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetDone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     bool result;
@@ -44753,7 +44921,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetDone(PyObject *, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIndividualLayoutConstraint_GetDone",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetDone",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44772,7 +44940,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetDone(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_SetDone(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SetDone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     bool arg2 ;
@@ -44782,7 +44950,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SetDone(PyObject *, PyObject
         (char *) "self",(char *) "d", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxIndividualLayoutConstraint_SetDone",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetDone",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44803,7 +44971,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SetDone(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_GetRelationship(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetRelationship(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxRelationship result;
@@ -44812,7 +44980,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetRelationship(PyObject *,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIndividualLayoutConstraint_GetRelationship",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetRelationship",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44829,7 +44997,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetRelationship(PyObject *,
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_SetRelationship(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SetRelationship(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxRelationship arg2 ;
@@ -44839,7 +45007,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SetRelationship(PyObject *,
         (char *) "self",(char *) "r", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxIndividualLayoutConstraint_SetRelationship",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetRelationship",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44860,7 +45028,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SetRelationship(PyObject *,
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_ResetIfWin(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_ResetIfWin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -44871,7 +45039,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_ResetIfWin(PyObject *, PyObj
         (char *) "self",(char *) "otherW", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxIndividualLayoutConstraint_ResetIfWin",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_ResetIfWin",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -44892,7 +45060,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_ResetIfWin(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_SatisfyConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SatisfyConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxLayoutConstraints *arg2 = (wxLayoutConstraints *) 0 ;
@@ -44905,7 +45073,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SatisfyConstraint(PyObject *
         (char *) "self",(char *) "constraints",(char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxIndividualLayoutConstraint_SatisfyConstraint",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:IndividualLayoutConstraint_SatisfyConstraint",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxLayoutConstraints, SWIG_POINTER_EXCEPTION | 0);
@@ -44928,7 +45096,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SatisfyConstraint(PyObject *
 }
 
 
-static PyObject *_wrap_wxIndividualLayoutConstraint_GetEdge(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxEdge arg2 ;
@@ -44943,7 +45111,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetEdge(PyObject *, PyObject
         (char *) "self",(char *) "which",(char *) "thisWin",(char *) "other", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxIndividualLayoutConstraint_GetEdge",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:IndividualLayoutConstraint_GetEdge",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxIndividualLayoutConstraint, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -44970,14 +45138,14 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_GetEdge(PyObject *, PyObject
 }
 
 
-static PyObject * wxIndividualLayoutConstraint_swigregister(PyObject *, PyObject *args) {
+static PyObject * IndividualLayoutConstraint_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxIndividualLayoutConstraint, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_wxLayoutConstraints_left_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_left_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -44986,7 +45154,7 @@ static PyObject *_wrap_wxLayoutConstraints_left_get(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxLayoutConstraints_left_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_left_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLayoutConstraints, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (wxIndividualLayoutConstraint *)& ((arg1)->left);
@@ -44998,7 +45166,7 @@ static PyObject *_wrap_wxLayoutConstraints_left_get(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxLayoutConstraints_top_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_top_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -45007,7 +45175,7 @@ static PyObject *_wrap_wxLayoutConstraints_top_get(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxLayoutConstraints_top_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_top_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLayoutConstraints, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (wxIndividualLayoutConstraint *)& ((arg1)->top);
@@ -45019,7 +45187,7 @@ static PyObject *_wrap_wxLayoutConstraints_top_get(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_wxLayoutConstraints_right_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_right_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -45028,7 +45196,7 @@ static PyObject *_wrap_wxLayoutConstraints_right_get(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxLayoutConstraints_right_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_right_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLayoutConstraints, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (wxIndividualLayoutConstraint *)& ((arg1)->right);
@@ -45040,7 +45208,7 @@ static PyObject *_wrap_wxLayoutConstraints_right_get(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxLayoutConstraints_bottom_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_bottom_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -45049,7 +45217,7 @@ static PyObject *_wrap_wxLayoutConstraints_bottom_get(PyObject *, PyObject *args
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxLayoutConstraints_bottom_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_bottom_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLayoutConstraints, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (wxIndividualLayoutConstraint *)& ((arg1)->bottom);
@@ -45061,7 +45229,7 @@ static PyObject *_wrap_wxLayoutConstraints_bottom_get(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_width_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -45070,7 +45238,7 @@ static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxLayoutConstraints_width_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_width_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLayoutConstraints, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (wxIndividualLayoutConstraint *)& ((arg1)->width);
@@ -45082,7 +45250,7 @@ static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_wxLayoutConstraints_height_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_height_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -45091,7 +45259,7 @@ static PyObject *_wrap_wxLayoutConstraints_height_get(PyObject *, PyObject *args
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxLayoutConstraints_height_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_height_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLayoutConstraints, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (wxIndividualLayoutConstraint *)& ((arg1)->height);
@@ -45103,7 +45271,7 @@ static PyObject *_wrap_wxLayoutConstraints_height_get(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_wxLayoutConstraints_centreX_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_centreX_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -45112,7 +45280,7 @@ static PyObject *_wrap_wxLayoutConstraints_centreX_get(PyObject *, PyObject *arg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxLayoutConstraints_centreX_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_centreX_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLayoutConstraints, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (wxIndividualLayoutConstraint *)& ((arg1)->centreX);
@@ -45124,7 +45292,7 @@ static PyObject *_wrap_wxLayoutConstraints_centreX_get(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_wxLayoutConstraints_centreY_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_centreY_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -45133,7 +45301,7 @@ static PyObject *_wrap_wxLayoutConstraints_centreY_get(PyObject *, PyObject *arg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxLayoutConstraints_centreY_get",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_centreY_get",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLayoutConstraints, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     result = (wxIndividualLayoutConstraint *)& ((arg1)->centreY);
@@ -45145,14 +45313,14 @@ static PyObject *_wrap_wxLayoutConstraints_centreY_get(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_new_wxLayoutConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_LayoutConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *result;
     char *kwnames[] = {
         NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_wxLayoutConstraints",kwnames)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_LayoutConstraints",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxLayoutConstraints *)new wxLayoutConstraints();
@@ -45167,7 +45335,7 @@ static PyObject *_wrap_new_wxLayoutConstraints(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_wxLayoutConstraints_SatisfyConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_SatisfyConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -45182,7 +45350,7 @@ static PyObject *_wrap_wxLayoutConstraints_SatisfyConstraints(PyObject *, PyObje
     };
     
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxLayoutConstraints_SatisfyConstraints",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LayoutConstraints_SatisfyConstraints",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLayoutConstraints, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
@@ -45205,7 +45373,7 @@ static PyObject *_wrap_wxLayoutConstraints_SatisfyConstraints(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_wxLayoutConstraints_AreSatisfied(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_AreSatisfied(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     bool result;
@@ -45214,7 +45382,7 @@ static PyObject *_wrap_wxLayoutConstraints_AreSatisfied(PyObject *, PyObject *ar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxLayoutConstraints_AreSatisfied",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_AreSatisfied",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLayoutConstraints, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -45233,7 +45401,7 @@ static PyObject *_wrap_wxLayoutConstraints_AreSatisfied(PyObject *, PyObject *ar
 }
 
 
-static PyObject * wxLayoutConstraints_swigregister(PyObject *, PyObject *args) {
+static PyObject * LayoutConstraints_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxLayoutConstraints, obj);
@@ -45243,140 +45411,140 @@ static PyObject * wxLayoutConstraints_swigregister(PyObject *, PyObject *args) {
 static PyMethodDef SwigMethods[] = {
         { (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS, NULL},
         { (char *)"_wxPyFixStockObjects", __wxPyFixStockObjects, METH_VARARGS, NULL},
-        { (char *)"wxObject_GetClassName", (PyCFunction) _wrap_wxObject_GetClassName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxObject_Destroy", (PyCFunction) _wrap_wxObject_Destroy, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxObject_swigregister", wxObject_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxSize_width_set", (PyCFunction) _wrap_wxSize_width_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_width_get", (PyCFunction) _wrap_wxSize_width_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_height_set", (PyCFunction) _wrap_wxSize_height_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_height_get", (PyCFunction) _wrap_wxSize_height_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"new_wxSize", (PyCFunction) _wrap_new_wxSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxSize", (PyCFunction) _wrap_delete_wxSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize___eq__", (PyCFunction) _wrap_wxSize___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize___ne__", (PyCFunction) _wrap_wxSize___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize___add__", (PyCFunction) _wrap_wxSize___add__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize___sub__", (PyCFunction) _wrap_wxSize___sub__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_IncTo", (PyCFunction) _wrap_wxSize_IncTo, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_DecTo", (PyCFunction) _wrap_wxSize_DecTo, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_Set", (PyCFunction) _wrap_wxSize_Set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_SetWidth", (PyCFunction) _wrap_wxSize_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_SetHeight", (PyCFunction) _wrap_wxSize_SetHeight, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_GetWidth", (PyCFunction) _wrap_wxSize_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_GetHeight", (PyCFunction) _wrap_wxSize_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_IsFullySpecified", (PyCFunction) _wrap_wxSize_IsFullySpecified, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_SetDefaults", (PyCFunction) _wrap_wxSize_SetDefaults, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_Get", (PyCFunction) _wrap_wxSize_Get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSize_swigregister", wxSize_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxRealPoint_x_set", (PyCFunction) _wrap_wxRealPoint_x_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRealPoint_x_get", (PyCFunction) _wrap_wxRealPoint_x_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRealPoint_y_set", (PyCFunction) _wrap_wxRealPoint_y_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRealPoint_y_get", (PyCFunction) _wrap_wxRealPoint_y_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"new_wxRealPoint", (PyCFunction) _wrap_new_wxRealPoint, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxRealPoint", (PyCFunction) _wrap_delete_wxRealPoint, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRealPoint___eq__", (PyCFunction) _wrap_wxRealPoint___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRealPoint___ne__", (PyCFunction) _wrap_wxRealPoint___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRealPoint___add__", (PyCFunction) _wrap_wxRealPoint___add__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRealPoint___sub__", (PyCFunction) _wrap_wxRealPoint___sub__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRealPoint_Set", (PyCFunction) _wrap_wxRealPoint_Set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRealPoint_Get", (PyCFunction) _wrap_wxRealPoint_Get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRealPoint_swigregister", wxRealPoint_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxPoint_x_set", (PyCFunction) _wrap_wxPoint_x_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint_x_get", (PyCFunction) _wrap_wxPoint_x_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint_y_set", (PyCFunction) _wrap_wxPoint_y_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint_y_get", (PyCFunction) _wrap_wxPoint_y_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"new_wxPoint", (PyCFunction) _wrap_new_wxPoint, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxPoint", (PyCFunction) _wrap_delete_wxPoint, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint___eq__", (PyCFunction) _wrap_wxPoint___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint___ne__", (PyCFunction) _wrap_wxPoint___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint___add__", (PyCFunction) _wrap_wxPoint___add__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint___sub__", (PyCFunction) _wrap_wxPoint___sub__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint___iadd__", (PyCFunction) _wrap_wxPoint___iadd__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint___isub__", (PyCFunction) _wrap_wxPoint___isub__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint_Set", (PyCFunction) _wrap_wxPoint_Set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint_Get", (PyCFunction) _wrap_wxPoint_Get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint_swigregister", wxPoint_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxRect", (PyCFunction) _wrap_new_wxRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Object_GetClassName", (PyCFunction) _wrap_Object_GetClassName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Object_Destroy", (PyCFunction) _wrap_Object_Destroy, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Object_swigregister", Object_swigregister, METH_VARARGS, NULL},
+        { (char *)"Size_width_set", (PyCFunction) _wrap_Size_width_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_width_get", (PyCFunction) _wrap_Size_width_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_height_set", (PyCFunction) _wrap_Size_height_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_height_get", (PyCFunction) _wrap_Size_height_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"new_Size", (PyCFunction) _wrap_new_Size, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_Size", (PyCFunction) _wrap_delete_Size, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size___eq__", (PyCFunction) _wrap_Size___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size___ne__", (PyCFunction) _wrap_Size___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size___add__", (PyCFunction) _wrap_Size___add__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size___sub__", (PyCFunction) _wrap_Size___sub__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_IncTo", (PyCFunction) _wrap_Size_IncTo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_DecTo", (PyCFunction) _wrap_Size_DecTo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_Set", (PyCFunction) _wrap_Size_Set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_SetWidth", (PyCFunction) _wrap_Size_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_SetHeight", (PyCFunction) _wrap_Size_SetHeight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_GetWidth", (PyCFunction) _wrap_Size_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_GetHeight", (PyCFunction) _wrap_Size_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_IsFullySpecified", (PyCFunction) _wrap_Size_IsFullySpecified, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_SetDefaults", (PyCFunction) _wrap_Size_SetDefaults, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_Get", (PyCFunction) _wrap_Size_Get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Size_swigregister", Size_swigregister, METH_VARARGS, NULL},
+        { (char *)"RealPoint_x_set", (PyCFunction) _wrap_RealPoint_x_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"RealPoint_x_get", (PyCFunction) _wrap_RealPoint_x_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"RealPoint_y_set", (PyCFunction) _wrap_RealPoint_y_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"RealPoint_y_get", (PyCFunction) _wrap_RealPoint_y_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"new_RealPoint", (PyCFunction) _wrap_new_RealPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_RealPoint", (PyCFunction) _wrap_delete_RealPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"RealPoint___eq__", (PyCFunction) _wrap_RealPoint___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"RealPoint___ne__", (PyCFunction) _wrap_RealPoint___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"RealPoint___add__", (PyCFunction) _wrap_RealPoint___add__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"RealPoint___sub__", (PyCFunction) _wrap_RealPoint___sub__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"RealPoint_Set", (PyCFunction) _wrap_RealPoint_Set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"RealPoint_Get", (PyCFunction) _wrap_RealPoint_Get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"RealPoint_swigregister", RealPoint_swigregister, METH_VARARGS, NULL},
+        { (char *)"Point_x_set", (PyCFunction) _wrap_Point_x_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point_x_get", (PyCFunction) _wrap_Point_x_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point_y_set", (PyCFunction) _wrap_Point_y_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point_y_get", (PyCFunction) _wrap_Point_y_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"new_Point", (PyCFunction) _wrap_new_Point, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_Point", (PyCFunction) _wrap_delete_Point, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point___eq__", (PyCFunction) _wrap_Point___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point___ne__", (PyCFunction) _wrap_Point___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point___add__", (PyCFunction) _wrap_Point___add__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point___sub__", (PyCFunction) _wrap_Point___sub__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point___iadd__", (PyCFunction) _wrap_Point___iadd__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point___isub__", (PyCFunction) _wrap_Point___isub__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point_Set", (PyCFunction) _wrap_Point_Set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point_Get", (PyCFunction) _wrap_Point_Get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point_swigregister", Point_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_Rect", (PyCFunction) _wrap_new_Rect, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_RectPP", (PyCFunction) _wrap_new_RectPP, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_RectPS", (PyCFunction) _wrap_new_RectPS, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_RectS", (PyCFunction) _wrap_new_RectS, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxRect", (PyCFunction) _wrap_delete_wxRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_GetX", (PyCFunction) _wrap_wxRect_GetX, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_SetX", (PyCFunction) _wrap_wxRect_SetX, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_GetY", (PyCFunction) _wrap_wxRect_GetY, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_SetY", (PyCFunction) _wrap_wxRect_SetY, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_GetWidth", (PyCFunction) _wrap_wxRect_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_SetWidth", (PyCFunction) _wrap_wxRect_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_GetHeight", (PyCFunction) _wrap_wxRect_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_SetHeight", (PyCFunction) _wrap_wxRect_SetHeight, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_GetPosition", (PyCFunction) _wrap_wxRect_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_SetPosition", (PyCFunction) _wrap_wxRect_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_GetSize", (PyCFunction) _wrap_wxRect_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_SetSize", (PyCFunction) _wrap_wxRect_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_IsEmpty", (PyCFunction) _wrap_wxRect_IsEmpty, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_GetTopLeft", (PyCFunction) _wrap_wxRect_GetTopLeft, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_SetTopLeft", (PyCFunction) _wrap_wxRect_SetTopLeft, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_GetBottomRight", (PyCFunction) _wrap_wxRect_GetBottomRight, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_SetBottomRight", (PyCFunction) _wrap_wxRect_SetBottomRight, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_GetLeft", (PyCFunction) _wrap_wxRect_GetLeft, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_GetTop", (PyCFunction) _wrap_wxRect_GetTop, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_GetBottom", (PyCFunction) _wrap_wxRect_GetBottom, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_GetRight", (PyCFunction) _wrap_wxRect_GetRight, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_SetLeft", (PyCFunction) _wrap_wxRect_SetLeft, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_SetRight", (PyCFunction) _wrap_wxRect_SetRight, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_SetTop", (PyCFunction) _wrap_wxRect_SetTop, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_SetBottom", (PyCFunction) _wrap_wxRect_SetBottom, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_Inflate", (PyCFunction) _wrap_wxRect_Inflate, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_Deflate", (PyCFunction) _wrap_wxRect_Deflate, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_OffsetXY", (PyCFunction) _wrap_wxRect_OffsetXY, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_Offset", (PyCFunction) _wrap_wxRect_Offset, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_Intersect", (PyCFunction) _wrap_wxRect_Intersect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_Union", (PyCFunction) _wrap_wxRect_Union, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect___add__", (PyCFunction) _wrap_wxRect___add__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect___iadd__", (PyCFunction) _wrap_wxRect___iadd__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect___eq__", (PyCFunction) _wrap_wxRect___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect___ne__", (PyCFunction) _wrap_wxRect___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_InsideXY", (PyCFunction) _wrap_wxRect_InsideXY, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_Inside", (PyCFunction) _wrap_wxRect_Inside, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_Intersects", (PyCFunction) _wrap_wxRect_Intersects, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_x_set", (PyCFunction) _wrap_wxRect_x_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_x_get", (PyCFunction) _wrap_wxRect_x_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_y_set", (PyCFunction) _wrap_wxRect_y_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_y_get", (PyCFunction) _wrap_wxRect_y_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_width_set", (PyCFunction) _wrap_wxRect_width_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_width_get", (PyCFunction) _wrap_wxRect_width_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_height_set", (PyCFunction) _wrap_wxRect_height_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_height_get", (PyCFunction) _wrap_wxRect_height_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_Set", (PyCFunction) _wrap_wxRect_Set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_Get", (PyCFunction) _wrap_wxRect_Get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxRect_swigregister", wxRect_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxIntersectRect", (PyCFunction) _wrap_wxIntersectRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"new_wxPoint2D", (PyCFunction) _wrap_new_wxPoint2D, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_Rect", (PyCFunction) _wrap_delete_Rect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_GetX", (PyCFunction) _wrap_Rect_GetX, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_SetX", (PyCFunction) _wrap_Rect_SetX, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_GetY", (PyCFunction) _wrap_Rect_GetY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_SetY", (PyCFunction) _wrap_Rect_SetY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_GetWidth", (PyCFunction) _wrap_Rect_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_SetWidth", (PyCFunction) _wrap_Rect_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_GetHeight", (PyCFunction) _wrap_Rect_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_SetHeight", (PyCFunction) _wrap_Rect_SetHeight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_GetPosition", (PyCFunction) _wrap_Rect_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_SetPosition", (PyCFunction) _wrap_Rect_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_GetSize", (PyCFunction) _wrap_Rect_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_SetSize", (PyCFunction) _wrap_Rect_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_IsEmpty", (PyCFunction) _wrap_Rect_IsEmpty, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_GetTopLeft", (PyCFunction) _wrap_Rect_GetTopLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_SetTopLeft", (PyCFunction) _wrap_Rect_SetTopLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_GetBottomRight", (PyCFunction) _wrap_Rect_GetBottomRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_SetBottomRight", (PyCFunction) _wrap_Rect_SetBottomRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_GetLeft", (PyCFunction) _wrap_Rect_GetLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_GetTop", (PyCFunction) _wrap_Rect_GetTop, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_GetBottom", (PyCFunction) _wrap_Rect_GetBottom, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_GetRight", (PyCFunction) _wrap_Rect_GetRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_SetLeft", (PyCFunction) _wrap_Rect_SetLeft, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_SetRight", (PyCFunction) _wrap_Rect_SetRight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_SetTop", (PyCFunction) _wrap_Rect_SetTop, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_SetBottom", (PyCFunction) _wrap_Rect_SetBottom, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_Inflate", (PyCFunction) _wrap_Rect_Inflate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_Deflate", (PyCFunction) _wrap_Rect_Deflate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_OffsetXY", (PyCFunction) _wrap_Rect_OffsetXY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_Offset", (PyCFunction) _wrap_Rect_Offset, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_Intersect", (PyCFunction) _wrap_Rect_Intersect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_Union", (PyCFunction) _wrap_Rect_Union, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect___add__", (PyCFunction) _wrap_Rect___add__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect___iadd__", (PyCFunction) _wrap_Rect___iadd__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect___eq__", (PyCFunction) _wrap_Rect___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect___ne__", (PyCFunction) _wrap_Rect___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_InsideXY", (PyCFunction) _wrap_Rect_InsideXY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_Inside", (PyCFunction) _wrap_Rect_Inside, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_Intersects", (PyCFunction) _wrap_Rect_Intersects, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_x_set", (PyCFunction) _wrap_Rect_x_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_x_get", (PyCFunction) _wrap_Rect_x_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_y_set", (PyCFunction) _wrap_Rect_y_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_y_get", (PyCFunction) _wrap_Rect_y_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_width_set", (PyCFunction) _wrap_Rect_width_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_width_get", (PyCFunction) _wrap_Rect_width_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_height_set", (PyCFunction) _wrap_Rect_height_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_height_get", (PyCFunction) _wrap_Rect_height_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_Set", (PyCFunction) _wrap_Rect_Set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_Get", (PyCFunction) _wrap_Rect_Get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Rect_swigregister", Rect_swigregister, METH_VARARGS, NULL},
+        { (char *)"IntersectRect", (PyCFunction) _wrap_IntersectRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"new_Point2D", (PyCFunction) _wrap_new_Point2D, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_Point2DCopy", (PyCFunction) _wrap_new_Point2DCopy, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_Point2DFromPoint", (PyCFunction) _wrap_new_Point2DFromPoint, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_GetFloor", (PyCFunction) _wrap_wxPoint2D_GetFloor, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_GetRounded", (PyCFunction) _wrap_wxPoint2D_GetRounded, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_GetVectorLength", (PyCFunction) _wrap_wxPoint2D_GetVectorLength, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_GetVectorAngle", (PyCFunction) _wrap_wxPoint2D_GetVectorAngle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_SetVectorLength", (PyCFunction) _wrap_wxPoint2D_SetVectorLength, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_SetVectorAngle", (PyCFunction) _wrap_wxPoint2D_SetVectorAngle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_GetDistance", (PyCFunction) _wrap_wxPoint2D_GetDistance, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_GetDistanceSquare", (PyCFunction) _wrap_wxPoint2D_GetDistanceSquare, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_GetDotProduct", (PyCFunction) _wrap_wxPoint2D_GetDotProduct, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_GetCrossProduct", (PyCFunction) _wrap_wxPoint2D_GetCrossProduct, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D___neg__", (PyCFunction) _wrap_wxPoint2D___neg__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D___iadd__", (PyCFunction) _wrap_wxPoint2D___iadd__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D___isub__", (PyCFunction) _wrap_wxPoint2D___isub__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D___imul__", (PyCFunction) _wrap_wxPoint2D___imul__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D___idiv__", (PyCFunction) _wrap_wxPoint2D___idiv__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D___eq__", (PyCFunction) _wrap_wxPoint2D___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D___ne__", (PyCFunction) _wrap_wxPoint2D___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_x_set", (PyCFunction) _wrap_wxPoint2D_x_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_x_get", (PyCFunction) _wrap_wxPoint2D_x_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_y_set", (PyCFunction) _wrap_wxPoint2D_y_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_y_get", (PyCFunction) _wrap_wxPoint2D_y_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_Set", (PyCFunction) _wrap_wxPoint2D_Set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_Get", (PyCFunction) _wrap_wxPoint2D_Get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPoint2D_swigregister", wxPoint2D_swigregister, METH_VARARGS, NULL},
+        { (char *)"Point2D_GetFloor", (PyCFunction) _wrap_Point2D_GetFloor, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_GetRounded", (PyCFunction) _wrap_Point2D_GetRounded, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_GetVectorLength", (PyCFunction) _wrap_Point2D_GetVectorLength, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_GetVectorAngle", (PyCFunction) _wrap_Point2D_GetVectorAngle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_SetVectorLength", (PyCFunction) _wrap_Point2D_SetVectorLength, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_SetVectorAngle", (PyCFunction) _wrap_Point2D_SetVectorAngle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_GetDistance", (PyCFunction) _wrap_Point2D_GetDistance, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_GetDistanceSquare", (PyCFunction) _wrap_Point2D_GetDistanceSquare, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_GetDotProduct", (PyCFunction) _wrap_Point2D_GetDotProduct, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_GetCrossProduct", (PyCFunction) _wrap_Point2D_GetCrossProduct, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D___neg__", (PyCFunction) _wrap_Point2D___neg__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D___iadd__", (PyCFunction) _wrap_Point2D___iadd__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D___isub__", (PyCFunction) _wrap_Point2D___isub__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D___imul__", (PyCFunction) _wrap_Point2D___imul__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D___idiv__", (PyCFunction) _wrap_Point2D___idiv__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D___eq__", (PyCFunction) _wrap_Point2D___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D___ne__", (PyCFunction) _wrap_Point2D___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_x_set", (PyCFunction) _wrap_Point2D_x_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_x_get", (PyCFunction) _wrap_Point2D_x_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_y_set", (PyCFunction) _wrap_Point2D_y_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_y_get", (PyCFunction) _wrap_Point2D_y_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_Set", (PyCFunction) _wrap_Point2D_Set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_Get", (PyCFunction) _wrap_Point2D_Get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Point2D_swigregister", Point2D_swigregister, METH_VARARGS, NULL},
         { (char *)"new_InputStream", (PyCFunction) _wrap_new_InputStream, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_InputStream", (PyCFunction) _wrap_delete_InputStream, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"InputStream_close", (PyCFunction) _wrap_InputStream_close, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -45396,16 +45564,16 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"InputStream_SeekI", (PyCFunction) _wrap_InputStream_SeekI, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"InputStream_TellI", (PyCFunction) _wrap_InputStream_TellI, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"InputStream_swigregister", InputStream_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxOutputStream_write", (PyCFunction) _wrap_wxOutputStream_write, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxOutputStream_swigregister", wxOutputStream_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxFSFile", (PyCFunction) _wrap_new_wxFSFile, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxFSFile", (PyCFunction) _wrap_delete_wxFSFile, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFSFile_GetStream", (PyCFunction) _wrap_wxFSFile_GetStream, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFSFile_GetMimeType", (PyCFunction) _wrap_wxFSFile_GetMimeType, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFSFile_GetLocation", (PyCFunction) _wrap_wxFSFile_GetLocation, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFSFile_GetAnchor", (PyCFunction) _wrap_wxFSFile_GetAnchor, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFSFile_GetModificationTime", (PyCFunction) _wrap_wxFSFile_GetModificationTime, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFSFile_swigregister", wxFSFile_swigregister, METH_VARARGS, NULL},
+        { (char *)"OutputStream_write", (PyCFunction) _wrap_OutputStream_write, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"OutputStream_swigregister", OutputStream_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_FSFile", (PyCFunction) _wrap_new_FSFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_FSFile", (PyCFunction) _wrap_delete_FSFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FSFile_GetStream", (PyCFunction) _wrap_FSFile_GetStream, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FSFile_GetMimeType", (PyCFunction) _wrap_FSFile_GetMimeType, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FSFile_GetLocation", (PyCFunction) _wrap_FSFile_GetLocation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FSFile_GetAnchor", (PyCFunction) _wrap_FSFile_GetAnchor, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FSFile_GetModificationTime", (PyCFunction) _wrap_FSFile_GetModificationTime, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FSFile_swigregister", FSFile_swigregister, METH_VARARGS, NULL},
         { (char *)"CPPFileSystemHandler_swigregister", CPPFileSystemHandler_swigregister, METH_VARARGS, NULL},
         { (char *)"new_FileSystemHandler", (PyCFunction) _wrap_new_FileSystemHandler, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"FileSystemHandler__setCallbackInfo", (PyCFunction) _wrap_FileSystemHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -45419,57 +45587,57 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"FileSystemHandler_GetRightLocation", (PyCFunction) _wrap_FileSystemHandler_GetRightLocation, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"FileSystemHandler_GetMimeTypeFromExt", (PyCFunction) _wrap_FileSystemHandler_GetMimeTypeFromExt, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"FileSystemHandler_swigregister", FileSystemHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxFileSystem", (PyCFunction) _wrap_new_wxFileSystem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxFileSystem", (PyCFunction) _wrap_delete_wxFileSystem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFileSystem_ChangePathTo", (PyCFunction) _wrap_wxFileSystem_ChangePathTo, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFileSystem_GetPath", (PyCFunction) _wrap_wxFileSystem_GetPath, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFileSystem_OpenFile", (PyCFunction) _wrap_wxFileSystem_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFileSystem_FindFirst", (PyCFunction) _wrap_wxFileSystem_FindFirst, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFileSystem_FindNext", (PyCFunction) _wrap_wxFileSystem_FindNext, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFileSystem_AddHandler", (PyCFunction) _wrap_wxFileSystem_AddHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFileSystem_CleanUpHandlers", (PyCFunction) _wrap_wxFileSystem_CleanUpHandlers, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFileSystem_FileNameToURL", (PyCFunction) _wrap_wxFileSystem_FileNameToURL, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFileSystem_URLToFileName", (PyCFunction) _wrap_wxFileSystem_URLToFileName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFileSystem_swigregister", wxFileSystem_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxInternetFSHandler", (PyCFunction) _wrap_new_wxInternetFSHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxInternetFSHandler_CanOpen", (PyCFunction) _wrap_wxInternetFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxInternetFSHandler_OpenFile", (PyCFunction) _wrap_wxInternetFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxInternetFSHandler_swigregister", wxInternetFSHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxZipFSHandler", (PyCFunction) _wrap_new_wxZipFSHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxZipFSHandler_CanOpen", (PyCFunction) _wrap_wxZipFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxZipFSHandler_OpenFile", (PyCFunction) _wrap_wxZipFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxZipFSHandler_FindFirst", (PyCFunction) _wrap_wxZipFSHandler_FindFirst, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxZipFSHandler_FindNext", (PyCFunction) _wrap_wxZipFSHandler_FindNext, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxZipFSHandler_swigregister", wxZipFSHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_FileSystem", (PyCFunction) _wrap_new_FileSystem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_FileSystem", (PyCFunction) _wrap_delete_FileSystem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FileSystem_ChangePathTo", (PyCFunction) _wrap_FileSystem_ChangePathTo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FileSystem_GetPath", (PyCFunction) _wrap_FileSystem_GetPath, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FileSystem_OpenFile", (PyCFunction) _wrap_FileSystem_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FileSystem_FindFirst", (PyCFunction) _wrap_FileSystem_FindFirst, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FileSystem_FindNext", (PyCFunction) _wrap_FileSystem_FindNext, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FileSystem_AddHandler", (PyCFunction) _wrap_FileSystem_AddHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FileSystem_CleanUpHandlers", (PyCFunction) _wrap_FileSystem_CleanUpHandlers, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FileSystem_FileNameToURL", (PyCFunction) _wrap_FileSystem_FileNameToURL, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FileSystem_URLToFileName", (PyCFunction) _wrap_FileSystem_URLToFileName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FileSystem_swigregister", FileSystem_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_InternetFSHandler", (PyCFunction) _wrap_new_InternetFSHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"InternetFSHandler_CanOpen", (PyCFunction) _wrap_InternetFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"InternetFSHandler_OpenFile", (PyCFunction) _wrap_InternetFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"InternetFSHandler_swigregister", InternetFSHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_ZipFSHandler", (PyCFunction) _wrap_new_ZipFSHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ZipFSHandler_CanOpen", (PyCFunction) _wrap_ZipFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ZipFSHandler_OpenFile", (PyCFunction) _wrap_ZipFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ZipFSHandler_FindFirst", (PyCFunction) _wrap_ZipFSHandler_FindFirst, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ZipFSHandler_FindNext", (PyCFunction) _wrap_ZipFSHandler_FindNext, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ZipFSHandler_swigregister", ZipFSHandler_swigregister, METH_VARARGS, NULL},
         { (char *)"__wxMemoryFSHandler_AddFile_wxImage", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxImage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"__wxMemoryFSHandler_AddFile_wxBitmap", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"__wxMemoryFSHandler_AddFile_Data", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_Data, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"new_wxMemoryFSHandler", (PyCFunction) _wrap_new_wxMemoryFSHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMemoryFSHandler_RemoveFile", (PyCFunction) _wrap_wxMemoryFSHandler_RemoveFile, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMemoryFSHandler_CanOpen", (PyCFunction) _wrap_wxMemoryFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMemoryFSHandler_OpenFile", (PyCFunction) _wrap_wxMemoryFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMemoryFSHandler_FindFirst", (PyCFunction) _wrap_wxMemoryFSHandler_FindFirst, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMemoryFSHandler_FindNext", (PyCFunction) _wrap_wxMemoryFSHandler_FindNext, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMemoryFSHandler_swigregister", wxMemoryFSHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxImageHandler_GetName", (PyCFunction) _wrap_wxImageHandler_GetName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHandler_GetExtension", (PyCFunction) _wrap_wxImageHandler_GetExtension, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHandler_GetType", (PyCFunction) _wrap_wxImageHandler_GetType, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHandler_GetMimeType", (PyCFunction) _wrap_wxImageHandler_GetMimeType, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHandler_CanRead", (PyCFunction) _wrap_wxImageHandler_CanRead, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHandler_SetName", (PyCFunction) _wrap_wxImageHandler_SetName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHandler_SetExtension", (PyCFunction) _wrap_wxImageHandler_SetExtension, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHandler_SetType", (PyCFunction) _wrap_wxImageHandler_SetType, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHandler_SetMimeType", (PyCFunction) _wrap_wxImageHandler_SetMimeType, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHandler_swigregister", wxImageHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxImageHistogram", (PyCFunction) _wrap_new_wxImageHistogram, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHistogram_MakeKey", (PyCFunction) _wrap_wxImageHistogram_MakeKey, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHistogram_FindFirstUnusedColour", (PyCFunction) _wrap_wxImageHistogram_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHistogram_GetCount", (PyCFunction) _wrap_wxImageHistogram_GetCount, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHistogram_GetCountRGB", (PyCFunction) _wrap_wxImageHistogram_GetCountRGB, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHistogram_GetCountColour", (PyCFunction) _wrap_wxImageHistogram_GetCountColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImageHistogram_swigregister", wxImageHistogram_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxImage", (PyCFunction) _wrap_new_wxImage, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxImage", (PyCFunction) _wrap_delete_wxImage, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"new_MemoryFSHandler", (PyCFunction) _wrap_new_MemoryFSHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MemoryFSHandler_RemoveFile", (PyCFunction) _wrap_MemoryFSHandler_RemoveFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MemoryFSHandler_CanOpen", (PyCFunction) _wrap_MemoryFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MemoryFSHandler_OpenFile", (PyCFunction) _wrap_MemoryFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MemoryFSHandler_FindFirst", (PyCFunction) _wrap_MemoryFSHandler_FindFirst, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MemoryFSHandler_FindNext", (PyCFunction) _wrap_MemoryFSHandler_FindNext, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MemoryFSHandler_swigregister", MemoryFSHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"ImageHandler_GetName", (PyCFunction) _wrap_ImageHandler_GetName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHandler_GetExtension", (PyCFunction) _wrap_ImageHandler_GetExtension, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHandler_GetType", (PyCFunction) _wrap_ImageHandler_GetType, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHandler_GetMimeType", (PyCFunction) _wrap_ImageHandler_GetMimeType, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHandler_CanRead", (PyCFunction) _wrap_ImageHandler_CanRead, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHandler_SetName", (PyCFunction) _wrap_ImageHandler_SetName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHandler_SetExtension", (PyCFunction) _wrap_ImageHandler_SetExtension, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHandler_SetType", (PyCFunction) _wrap_ImageHandler_SetType, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHandler_SetMimeType", (PyCFunction) _wrap_ImageHandler_SetMimeType, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHandler_swigregister", ImageHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_ImageHistogram", (PyCFunction) _wrap_new_ImageHistogram, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHistogram_MakeKey", (PyCFunction) _wrap_ImageHistogram_MakeKey, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHistogram_FindFirstUnusedColour", (PyCFunction) _wrap_ImageHistogram_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHistogram_GetCount", (PyCFunction) _wrap_ImageHistogram_GetCount, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHistogram_GetCountRGB", (PyCFunction) _wrap_ImageHistogram_GetCountRGB, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHistogram_GetCountColour", (PyCFunction) _wrap_ImageHistogram_GetCountColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ImageHistogram_swigregister", ImageHistogram_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_Image", (PyCFunction) _wrap_new_Image, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_Image", (PyCFunction) _wrap_delete_Image, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_ImageFromMime", (PyCFunction) _wrap_new_ImageFromMime, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_ImageFromStream", (PyCFunction) _wrap_new_ImageFromStream, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_ImageFromStreamMime", (PyCFunction) _wrap_new_ImageFromStreamMime, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -45477,1077 +45645,1083 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_ImageFromBitmap", (PyCFunction) _wrap_new_ImageFromBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_ImageFromData", (PyCFunction) _wrap_new_ImageFromData, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_ImageFromDataWithAlpha", (PyCFunction) _wrap_new_ImageFromDataWithAlpha, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_Create", (PyCFunction) _wrap_wxImage_Create, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_Destroy", (PyCFunction) _wrap_wxImage_Destroy, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_Scale", (PyCFunction) _wrap_wxImage_Scale, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_ShrinkBy", (PyCFunction) _wrap_wxImage_ShrinkBy, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_Rescale", (PyCFunction) _wrap_wxImage_Rescale, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_Resize", (PyCFunction) _wrap_wxImage_Resize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SetRGB", (PyCFunction) _wrap_wxImage_SetRGB, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SetRGBRect", (PyCFunction) _wrap_wxImage_SetRGBRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetRed", (PyCFunction) _wrap_wxImage_GetRed, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetGreen", (PyCFunction) _wrap_wxImage_GetGreen, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetBlue", (PyCFunction) _wrap_wxImage_GetBlue, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SetAlpha", (PyCFunction) _wrap_wxImage_SetAlpha, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetAlpha", (PyCFunction) _wrap_wxImage_GetAlpha, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_HasAlpha", (PyCFunction) _wrap_wxImage_HasAlpha, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_InitAlpha", (PyCFunction) _wrap_wxImage_InitAlpha, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_FindFirstUnusedColour", (PyCFunction) _wrap_wxImage_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_ConvertAlphaToMask", (PyCFunction) _wrap_wxImage_ConvertAlphaToMask, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_ConvertColourToAlpha", (PyCFunction) _wrap_wxImage_ConvertColourToAlpha, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SetMaskFromImage", (PyCFunction) _wrap_wxImage_SetMaskFromImage, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_CanRead", (PyCFunction) _wrap_wxImage_CanRead, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetImageCount", (PyCFunction) _wrap_wxImage_GetImageCount, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_LoadFile", (PyCFunction) _wrap_wxImage_LoadFile, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_LoadMimeFile", (PyCFunction) _wrap_wxImage_LoadMimeFile, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SaveFile", (PyCFunction) _wrap_wxImage_SaveFile, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SaveMimeFile", (PyCFunction) _wrap_wxImage_SaveMimeFile, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_CanReadStream", (PyCFunction) _wrap_wxImage_CanReadStream, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_LoadStream", (PyCFunction) _wrap_wxImage_LoadStream, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_LoadMimeStream", (PyCFunction) _wrap_wxImage_LoadMimeStream, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_Ok", (PyCFunction) _wrap_wxImage_Ok, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetWidth", (PyCFunction) _wrap_wxImage_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetHeight", (PyCFunction) _wrap_wxImage_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetSize", (PyCFunction) _wrap_wxImage_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetSubImage", (PyCFunction) _wrap_wxImage_GetSubImage, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_Size", (PyCFunction) _wrap_wxImage_Size, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_Copy", (PyCFunction) _wrap_wxImage_Copy, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_Paste", (PyCFunction) _wrap_wxImage_Paste, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetData", (PyCFunction) _wrap_wxImage_GetData, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SetData", (PyCFunction) _wrap_wxImage_SetData, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetDataBuffer", (PyCFunction) _wrap_wxImage_GetDataBuffer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SetDataBuffer", (PyCFunction) _wrap_wxImage_SetDataBuffer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetAlphaData", (PyCFunction) _wrap_wxImage_GetAlphaData, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SetAlphaData", (PyCFunction) _wrap_wxImage_SetAlphaData, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetAlphaBuffer", (PyCFunction) _wrap_wxImage_GetAlphaBuffer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SetAlphaBuffer", (PyCFunction) _wrap_wxImage_SetAlphaBuffer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SetMaskColour", (PyCFunction) _wrap_wxImage_SetMaskColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetOrFindMaskColour", (PyCFunction) _wrap_wxImage_GetOrFindMaskColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetMaskRed", (PyCFunction) _wrap_wxImage_GetMaskRed, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetMaskGreen", (PyCFunction) _wrap_wxImage_GetMaskGreen, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetMaskBlue", (PyCFunction) _wrap_wxImage_GetMaskBlue, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SetMask", (PyCFunction) _wrap_wxImage_SetMask, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_HasMask", (PyCFunction) _wrap_wxImage_HasMask, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_Rotate", (PyCFunction) _wrap_wxImage_Rotate, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_Rotate90", (PyCFunction) _wrap_wxImage_Rotate90, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_Mirror", (PyCFunction) _wrap_wxImage_Mirror, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_Replace", (PyCFunction) _wrap_wxImage_Replace, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_ConvertToMono", (PyCFunction) _wrap_wxImage_ConvertToMono, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SetOption", (PyCFunction) _wrap_wxImage_SetOption, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_SetOptionInt", (PyCFunction) _wrap_wxImage_SetOptionInt, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetOption", (PyCFunction) _wrap_wxImage_GetOption, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetOptionInt", (PyCFunction) _wrap_wxImage_GetOptionInt, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_HasOption", (PyCFunction) _wrap_wxImage_HasOption, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_CountColours", (PyCFunction) _wrap_wxImage_CountColours, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_ComputeHistogram", (PyCFunction) _wrap_wxImage_ComputeHistogram, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_AddHandler", (PyCFunction) _wrap_wxImage_AddHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_InsertHandler", (PyCFunction) _wrap_wxImage_InsertHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_RemoveHandler", (PyCFunction) _wrap_wxImage_RemoveHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_GetImageExtWildcard", (PyCFunction) _wrap_wxImage_GetImageExtWildcard, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_ConvertToBitmap", (PyCFunction) _wrap_wxImage_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_ConvertToMonoBitmap", (PyCFunction) _wrap_wxImage_ConvertToMonoBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxImage_swigregister", wxImage_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxBMPHandler", (PyCFunction) _wrap_new_wxBMPHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxBMPHandler_swigregister", wxBMPHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxICOHandler", (PyCFunction) _wrap_new_wxICOHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxICOHandler_swigregister", wxICOHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxCURHandler", (PyCFunction) _wrap_new_wxCURHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCURHandler_swigregister", wxCURHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxANIHandler", (PyCFunction) _wrap_new_wxANIHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxANIHandler_swigregister", wxANIHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxPNGHandler", (PyCFunction) _wrap_new_wxPNGHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPNGHandler_swigregister", wxPNGHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxGIFHandler", (PyCFunction) _wrap_new_wxGIFHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGIFHandler_swigregister", wxGIFHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxPCXHandler", (PyCFunction) _wrap_new_wxPCXHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPCXHandler_swigregister", wxPCXHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxJPEGHandler", (PyCFunction) _wrap_new_wxJPEGHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxJPEGHandler_swigregister", wxJPEGHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxPNMHandler", (PyCFunction) _wrap_new_wxPNMHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPNMHandler_swigregister", wxPNMHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxXPMHandler", (PyCFunction) _wrap_new_wxXPMHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxXPMHandler_swigregister", wxXPMHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxTIFFHandler", (PyCFunction) _wrap_new_wxTIFFHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxTIFFHandler_swigregister", wxTIFFHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxQuantize_Quantize", (PyCFunction) _wrap_wxQuantize_Quantize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxQuantize_swigregister", wxQuantize_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxEvtHandler", (PyCFunction) _wrap_new_wxEvtHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvtHandler_GetNextHandler", (PyCFunction) _wrap_wxEvtHandler_GetNextHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvtHandler_GetPreviousHandler", (PyCFunction) _wrap_wxEvtHandler_GetPreviousHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvtHandler_SetNextHandler", (PyCFunction) _wrap_wxEvtHandler_SetNextHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvtHandler_SetPreviousHandler", (PyCFunction) _wrap_wxEvtHandler_SetPreviousHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvtHandler_GetEvtHandlerEnabled", (PyCFunction) _wrap_wxEvtHandler_GetEvtHandlerEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvtHandler_SetEvtHandlerEnabled", (PyCFunction) _wrap_wxEvtHandler_SetEvtHandlerEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvtHandler_ProcessEvent", (PyCFunction) _wrap_wxEvtHandler_ProcessEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvtHandler_AddPendingEvent", (PyCFunction) _wrap_wxEvtHandler_AddPendingEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvtHandler_ProcessPendingEvents", (PyCFunction) _wrap_wxEvtHandler_ProcessPendingEvents, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvtHandler_Connect", (PyCFunction) _wrap_wxEvtHandler_Connect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvtHandler_Disconnect", (PyCFunction) _wrap_wxEvtHandler_Disconnect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvtHandler__setOORInfo", (PyCFunction) _wrap_wxEvtHandler__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvtHandler_swigregister", wxEvtHandler_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxNewEventType", (PyCFunction) _wrap_wxNewEventType, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxEvent", (PyCFunction) _wrap_delete_wxEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_SetEventType", (PyCFunction) _wrap_wxEvent_SetEventType, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_GetEventType", (PyCFunction) _wrap_wxEvent_GetEventType, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_GetEventObject", (PyCFunction) _wrap_wxEvent_GetEventObject, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_SetEventObject", (PyCFunction) _wrap_wxEvent_SetEventObject, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_GetTimestamp", (PyCFunction) _wrap_wxEvent_GetTimestamp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_SetTimestamp", (PyCFunction) _wrap_wxEvent_SetTimestamp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_GetId", (PyCFunction) _wrap_wxEvent_GetId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_SetId", (PyCFunction) _wrap_wxEvent_SetId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_IsCommandEvent", (PyCFunction) _wrap_wxEvent_IsCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_Skip", (PyCFunction) _wrap_wxEvent_Skip, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_GetSkipped", (PyCFunction) _wrap_wxEvent_GetSkipped, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_ShouldPropagate", (PyCFunction) _wrap_wxEvent_ShouldPropagate, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_StopPropagation", (PyCFunction) _wrap_wxEvent_StopPropagation, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_ResumePropagation", (PyCFunction) _wrap_wxEvent_ResumePropagation, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_Clone", (PyCFunction) _wrap_wxEvent_Clone, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEvent_swigregister", wxEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxPropagationDisabler", (PyCFunction) _wrap_new_wxPropagationDisabler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxPropagationDisabler", (PyCFunction) _wrap_delete_wxPropagationDisabler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPropagationDisabler_swigregister", wxPropagationDisabler_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxPropagateOnce", (PyCFunction) _wrap_new_wxPropagateOnce, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxPropagateOnce", (PyCFunction) _wrap_delete_wxPropagateOnce, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPropagateOnce_swigregister", wxPropagateOnce_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxCommandEvent", (PyCFunction) _wrap_new_wxCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCommandEvent_GetSelection", (PyCFunction) _wrap_wxCommandEvent_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCommandEvent_SetString", (PyCFunction) _wrap_wxCommandEvent_SetString, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCommandEvent_GetString", (PyCFunction) _wrap_wxCommandEvent_GetString, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCommandEvent_IsChecked", (PyCFunction) _wrap_wxCommandEvent_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCommandEvent_IsSelection", (PyCFunction) _wrap_wxCommandEvent_IsSelection, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCommandEvent_SetExtraLong", (PyCFunction) _wrap_wxCommandEvent_SetExtraLong, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCommandEvent_GetExtraLong", (PyCFunction) _wrap_wxCommandEvent_GetExtraLong, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCommandEvent_SetInt", (PyCFunction) _wrap_wxCommandEvent_SetInt, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCommandEvent_GetInt", (PyCFunction) _wrap_wxCommandEvent_GetInt, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCommandEvent_Clone", (PyCFunction) _wrap_wxCommandEvent_Clone, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCommandEvent_swigregister", wxCommandEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxNotifyEvent", (PyCFunction) _wrap_new_wxNotifyEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNotifyEvent_Veto", (PyCFunction) _wrap_wxNotifyEvent_Veto, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNotifyEvent_Allow", (PyCFunction) _wrap_wxNotifyEvent_Allow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNotifyEvent_IsAllowed", (PyCFunction) _wrap_wxNotifyEvent_IsAllowed, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNotifyEvent_swigregister", wxNotifyEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxScrollEvent", (PyCFunction) _wrap_new_wxScrollEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxScrollEvent_GetOrientation", (PyCFunction) _wrap_wxScrollEvent_GetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxScrollEvent_GetPosition", (PyCFunction) _wrap_wxScrollEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxScrollEvent_SetOrientation", (PyCFunction) _wrap_wxScrollEvent_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxScrollEvent_SetPosition", (PyCFunction) _wrap_wxScrollEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxScrollEvent_swigregister", wxScrollEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxScrollWinEvent", (PyCFunction) _wrap_new_wxScrollWinEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxScrollWinEvent_GetOrientation", (PyCFunction) _wrap_wxScrollWinEvent_GetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxScrollWinEvent_GetPosition", (PyCFunction) _wrap_wxScrollWinEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxScrollWinEvent_SetOrientation", (PyCFunction) _wrap_wxScrollWinEvent_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxScrollWinEvent_SetPosition", (PyCFunction) _wrap_wxScrollWinEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxScrollWinEvent_swigregister", wxScrollWinEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxMouseEvent", (PyCFunction) _wrap_new_wxMouseEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_IsButton", (PyCFunction) _wrap_wxMouseEvent_IsButton, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_ButtonDown", (PyCFunction) _wrap_wxMouseEvent_ButtonDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_ButtonDClick", (PyCFunction) _wrap_wxMouseEvent_ButtonDClick, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_ButtonUp", (PyCFunction) _wrap_wxMouseEvent_ButtonUp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_Button", (PyCFunction) _wrap_wxMouseEvent_Button, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_ButtonIsDown", (PyCFunction) _wrap_wxMouseEvent_ButtonIsDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_GetButton", (PyCFunction) _wrap_wxMouseEvent_GetButton, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_ControlDown", (PyCFunction) _wrap_wxMouseEvent_ControlDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_MetaDown", (PyCFunction) _wrap_wxMouseEvent_MetaDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_AltDown", (PyCFunction) _wrap_wxMouseEvent_AltDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_ShiftDown", (PyCFunction) _wrap_wxMouseEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_CmdDown", (PyCFunction) _wrap_wxMouseEvent_CmdDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_LeftDown", (PyCFunction) _wrap_wxMouseEvent_LeftDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_MiddleDown", (PyCFunction) _wrap_wxMouseEvent_MiddleDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_RightDown", (PyCFunction) _wrap_wxMouseEvent_RightDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_LeftUp", (PyCFunction) _wrap_wxMouseEvent_LeftUp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_MiddleUp", (PyCFunction) _wrap_wxMouseEvent_MiddleUp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_RightUp", (PyCFunction) _wrap_wxMouseEvent_RightUp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_LeftDClick", (PyCFunction) _wrap_wxMouseEvent_LeftDClick, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_MiddleDClick", (PyCFunction) _wrap_wxMouseEvent_MiddleDClick, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_RightDClick", (PyCFunction) _wrap_wxMouseEvent_RightDClick, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_LeftIsDown", (PyCFunction) _wrap_wxMouseEvent_LeftIsDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_MiddleIsDown", (PyCFunction) _wrap_wxMouseEvent_MiddleIsDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_RightIsDown", (PyCFunction) _wrap_wxMouseEvent_RightIsDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_Dragging", (PyCFunction) _wrap_wxMouseEvent_Dragging, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_Moving", (PyCFunction) _wrap_wxMouseEvent_Moving, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_Entering", (PyCFunction) _wrap_wxMouseEvent_Entering, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_Leaving", (PyCFunction) _wrap_wxMouseEvent_Leaving, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_GetPosition", (PyCFunction) _wrap_wxMouseEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_GetPositionTuple", (PyCFunction) _wrap_wxMouseEvent_GetPositionTuple, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_GetLogicalPosition", (PyCFunction) _wrap_wxMouseEvent_GetLogicalPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_GetX", (PyCFunction) _wrap_wxMouseEvent_GetX, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_GetY", (PyCFunction) _wrap_wxMouseEvent_GetY, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_GetWheelRotation", (PyCFunction) _wrap_wxMouseEvent_GetWheelRotation, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_GetWheelDelta", (PyCFunction) _wrap_wxMouseEvent_GetWheelDelta, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_GetLinesPerAction", (PyCFunction) _wrap_wxMouseEvent_GetLinesPerAction, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_IsPageScroll", (PyCFunction) _wrap_wxMouseEvent_IsPageScroll, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_x_set", (PyCFunction) _wrap_wxMouseEvent_m_x_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_x_get", (PyCFunction) _wrap_wxMouseEvent_m_x_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_y_set", (PyCFunction) _wrap_wxMouseEvent_m_y_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_y_get", (PyCFunction) _wrap_wxMouseEvent_m_y_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_leftDown_set", (PyCFunction) _wrap_wxMouseEvent_m_leftDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_leftDown_get", (PyCFunction) _wrap_wxMouseEvent_m_leftDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_middleDown_set", (PyCFunction) _wrap_wxMouseEvent_m_middleDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_middleDown_get", (PyCFunction) _wrap_wxMouseEvent_m_middleDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_rightDown_set", (PyCFunction) _wrap_wxMouseEvent_m_rightDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_rightDown_get", (PyCFunction) _wrap_wxMouseEvent_m_rightDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_controlDown_set", (PyCFunction) _wrap_wxMouseEvent_m_controlDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_controlDown_get", (PyCFunction) _wrap_wxMouseEvent_m_controlDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_shiftDown_set", (PyCFunction) _wrap_wxMouseEvent_m_shiftDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_shiftDown_get", (PyCFunction) _wrap_wxMouseEvent_m_shiftDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_altDown_set", (PyCFunction) _wrap_wxMouseEvent_m_altDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_altDown_get", (PyCFunction) _wrap_wxMouseEvent_m_altDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_metaDown_set", (PyCFunction) _wrap_wxMouseEvent_m_metaDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_metaDown_get", (PyCFunction) _wrap_wxMouseEvent_m_metaDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_wheelRotation_set", (PyCFunction) _wrap_wxMouseEvent_m_wheelRotation_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_wheelRotation_get", (PyCFunction) _wrap_wxMouseEvent_m_wheelRotation_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_wheelDelta_set", (PyCFunction) _wrap_wxMouseEvent_m_wheelDelta_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_wheelDelta_get", (PyCFunction) _wrap_wxMouseEvent_m_wheelDelta_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_linesPerAction_set", (PyCFunction) _wrap_wxMouseEvent_m_linesPerAction_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_m_linesPerAction_get", (PyCFunction) _wrap_wxMouseEvent_m_linesPerAction_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseEvent_swigregister", wxMouseEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxSetCursorEvent", (PyCFunction) _wrap_new_wxSetCursorEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSetCursorEvent_GetX", (PyCFunction) _wrap_wxSetCursorEvent_GetX, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSetCursorEvent_GetY", (PyCFunction) _wrap_wxSetCursorEvent_GetY, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSetCursorEvent_SetCursor", (PyCFunction) _wrap_wxSetCursorEvent_SetCursor, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSetCursorEvent_GetCursor", (PyCFunction) _wrap_wxSetCursorEvent_GetCursor, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSetCursorEvent_HasCursor", (PyCFunction) _wrap_wxSetCursorEvent_HasCursor, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSetCursorEvent_swigregister", wxSetCursorEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxKeyEvent", (PyCFunction) _wrap_new_wxKeyEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_ControlDown", (PyCFunction) _wrap_wxKeyEvent_ControlDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_MetaDown", (PyCFunction) _wrap_wxKeyEvent_MetaDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_AltDown", (PyCFunction) _wrap_wxKeyEvent_AltDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_ShiftDown", (PyCFunction) _wrap_wxKeyEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_CmdDown", (PyCFunction) _wrap_wxKeyEvent_CmdDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_HasModifiers", (PyCFunction) _wrap_wxKeyEvent_HasModifiers, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_GetKeyCode", (PyCFunction) _wrap_wxKeyEvent_GetKeyCode, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_GetUnicodeKey", (PyCFunction) _wrap_wxKeyEvent_GetUnicodeKey, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_GetRawKeyCode", (PyCFunction) _wrap_wxKeyEvent_GetRawKeyCode, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_GetRawKeyFlags", (PyCFunction) _wrap_wxKeyEvent_GetRawKeyFlags, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_GetPosition", (PyCFunction) _wrap_wxKeyEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_GetPositionTuple", (PyCFunction) _wrap_wxKeyEvent_GetPositionTuple, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_GetX", (PyCFunction) _wrap_wxKeyEvent_GetX, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_GetY", (PyCFunction) _wrap_wxKeyEvent_GetY, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_x_set", (PyCFunction) _wrap_wxKeyEvent_m_x_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_x_get", (PyCFunction) _wrap_wxKeyEvent_m_x_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_y_set", (PyCFunction) _wrap_wxKeyEvent_m_y_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_y_get", (PyCFunction) _wrap_wxKeyEvent_m_y_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_keyCode_set", (PyCFunction) _wrap_wxKeyEvent_m_keyCode_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_keyCode_get", (PyCFunction) _wrap_wxKeyEvent_m_keyCode_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_controlDown_set", (PyCFunction) _wrap_wxKeyEvent_m_controlDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_controlDown_get", (PyCFunction) _wrap_wxKeyEvent_m_controlDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_shiftDown_set", (PyCFunction) _wrap_wxKeyEvent_m_shiftDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_shiftDown_get", (PyCFunction) _wrap_wxKeyEvent_m_shiftDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_altDown_set", (PyCFunction) _wrap_wxKeyEvent_m_altDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_altDown_get", (PyCFunction) _wrap_wxKeyEvent_m_altDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_metaDown_set", (PyCFunction) _wrap_wxKeyEvent_m_metaDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_metaDown_get", (PyCFunction) _wrap_wxKeyEvent_m_metaDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_scanCode_set", (PyCFunction) _wrap_wxKeyEvent_m_scanCode_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_scanCode_get", (PyCFunction) _wrap_wxKeyEvent_m_scanCode_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_rawCode_set", (PyCFunction) _wrap_wxKeyEvent_m_rawCode_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_rawCode_get", (PyCFunction) _wrap_wxKeyEvent_m_rawCode_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_rawFlags_set", (PyCFunction) _wrap_wxKeyEvent_m_rawFlags_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_m_rawFlags_get", (PyCFunction) _wrap_wxKeyEvent_m_rawFlags_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxKeyEvent_swigregister", wxKeyEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxSizeEvent", (PyCFunction) _wrap_new_wxSizeEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizeEvent_GetSize", (PyCFunction) _wrap_wxSizeEvent_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizeEvent_GetRect", (PyCFunction) _wrap_wxSizeEvent_GetRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizeEvent_SetRect", (PyCFunction) _wrap_wxSizeEvent_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizeEvent_SetSize", (PyCFunction) _wrap_wxSizeEvent_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizeEvent_m_size_set", (PyCFunction) _wrap_wxSizeEvent_m_size_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizeEvent_m_size_get", (PyCFunction) _wrap_wxSizeEvent_m_size_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizeEvent_m_rect_set", (PyCFunction) _wrap_wxSizeEvent_m_rect_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizeEvent_m_rect_get", (PyCFunction) _wrap_wxSizeEvent_m_rect_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizeEvent_swigregister", wxSizeEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxMoveEvent", (PyCFunction) _wrap_new_wxMoveEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMoveEvent_GetPosition", (PyCFunction) _wrap_wxMoveEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMoveEvent_GetRect", (PyCFunction) _wrap_wxMoveEvent_GetRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMoveEvent_SetRect", (PyCFunction) _wrap_wxMoveEvent_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMoveEvent_SetPosition", (PyCFunction) _wrap_wxMoveEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMoveEvent_swigregister", wxMoveEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxPaintEvent", (PyCFunction) _wrap_new_wxPaintEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPaintEvent_swigregister", wxPaintEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxNcPaintEvent", (PyCFunction) _wrap_new_wxNcPaintEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNcPaintEvent_swigregister", wxNcPaintEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxEraseEvent", (PyCFunction) _wrap_new_wxEraseEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEraseEvent_GetDC", (PyCFunction) _wrap_wxEraseEvent_GetDC, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEraseEvent_swigregister", wxEraseEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxFocusEvent", (PyCFunction) _wrap_new_wxFocusEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFocusEvent_GetWindow", (PyCFunction) _wrap_wxFocusEvent_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFocusEvent_SetWindow", (PyCFunction) _wrap_wxFocusEvent_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFocusEvent_swigregister", wxFocusEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxChildFocusEvent", (PyCFunction) _wrap_new_wxChildFocusEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxChildFocusEvent_GetWindow", (PyCFunction) _wrap_wxChildFocusEvent_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxChildFocusEvent_swigregister", wxChildFocusEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxActivateEvent", (PyCFunction) _wrap_new_wxActivateEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxActivateEvent_GetActive", (PyCFunction) _wrap_wxActivateEvent_GetActive, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxActivateEvent_swigregister", wxActivateEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxInitDialogEvent", (PyCFunction) _wrap_new_wxInitDialogEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxInitDialogEvent_swigregister", wxInitDialogEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxMenuEvent", (PyCFunction) _wrap_new_wxMenuEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuEvent_GetMenuId", (PyCFunction) _wrap_wxMenuEvent_GetMenuId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuEvent_IsPopup", (PyCFunction) _wrap_wxMenuEvent_IsPopup, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuEvent_GetMenu", (PyCFunction) _wrap_wxMenuEvent_GetMenu, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuEvent_swigregister", wxMenuEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxCloseEvent", (PyCFunction) _wrap_new_wxCloseEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCloseEvent_SetLoggingOff", (PyCFunction) _wrap_wxCloseEvent_SetLoggingOff, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCloseEvent_GetLoggingOff", (PyCFunction) _wrap_wxCloseEvent_GetLoggingOff, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCloseEvent_Veto", (PyCFunction) _wrap_wxCloseEvent_Veto, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCloseEvent_SetCanVeto", (PyCFunction) _wrap_wxCloseEvent_SetCanVeto, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCloseEvent_CanVeto", (PyCFunction) _wrap_wxCloseEvent_CanVeto, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCloseEvent_GetVeto", (PyCFunction) _wrap_wxCloseEvent_GetVeto, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxCloseEvent_swigregister", wxCloseEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxShowEvent", (PyCFunction) _wrap_new_wxShowEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxShowEvent_SetShow", (PyCFunction) _wrap_wxShowEvent_SetShow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxShowEvent_GetShow", (PyCFunction) _wrap_wxShowEvent_GetShow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxShowEvent_swigregister", wxShowEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxIconizeEvent", (PyCFunction) _wrap_new_wxIconizeEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIconizeEvent_Iconized", (PyCFunction) _wrap_wxIconizeEvent_Iconized, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIconizeEvent_swigregister", wxIconizeEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxMaximizeEvent", (PyCFunction) _wrap_new_wxMaximizeEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMaximizeEvent_swigregister", wxMaximizeEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxDropFilesEvent_GetPosition", (PyCFunction) _wrap_wxDropFilesEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxDropFilesEvent_GetNumberOfFiles", (PyCFunction) _wrap_wxDropFilesEvent_GetNumberOfFiles, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxDropFilesEvent_GetFiles", (PyCFunction) _wrap_wxDropFilesEvent_GetFiles, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxDropFilesEvent_swigregister", wxDropFilesEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxUpdateUIEvent", (PyCFunction) _wrap_new_wxUpdateUIEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_GetChecked", (PyCFunction) _wrap_wxUpdateUIEvent_GetChecked, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_GetEnabled", (PyCFunction) _wrap_wxUpdateUIEvent_GetEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_GetText", (PyCFunction) _wrap_wxUpdateUIEvent_GetText, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_GetSetText", (PyCFunction) _wrap_wxUpdateUIEvent_GetSetText, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_GetSetChecked", (PyCFunction) _wrap_wxUpdateUIEvent_GetSetChecked, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_GetSetEnabled", (PyCFunction) _wrap_wxUpdateUIEvent_GetSetEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_Check", (PyCFunction) _wrap_wxUpdateUIEvent_Check, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_Enable", (PyCFunction) _wrap_wxUpdateUIEvent_Enable, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_SetText", (PyCFunction) _wrap_wxUpdateUIEvent_SetText, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_SetUpdateInterval", (PyCFunction) _wrap_wxUpdateUIEvent_SetUpdateInterval, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_GetUpdateInterval", (PyCFunction) _wrap_wxUpdateUIEvent_GetUpdateInterval, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_CanUpdate", (PyCFunction) _wrap_wxUpdateUIEvent_CanUpdate, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_ResetUpdateTime", (PyCFunction) _wrap_wxUpdateUIEvent_ResetUpdateTime, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_SetMode", (PyCFunction) _wrap_wxUpdateUIEvent_SetMode, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_GetMode", (PyCFunction) _wrap_wxUpdateUIEvent_GetMode, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxUpdateUIEvent_swigregister", wxUpdateUIEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxSysColourChangedEvent", (PyCFunction) _wrap_new_wxSysColourChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSysColourChangedEvent_swigregister", wxSysColourChangedEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxMouseCaptureChangedEvent", (PyCFunction) _wrap_new_wxMouseCaptureChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseCaptureChangedEvent_GetCapturedWindow", (PyCFunction) _wrap_wxMouseCaptureChangedEvent_GetCapturedWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMouseCaptureChangedEvent_swigregister", wxMouseCaptureChangedEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxDisplayChangedEvent", (PyCFunction) _wrap_new_wxDisplayChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxDisplayChangedEvent_swigregister", wxDisplayChangedEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxPaletteChangedEvent", (PyCFunction) _wrap_new_wxPaletteChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPaletteChangedEvent_SetChangedWindow", (PyCFunction) _wrap_wxPaletteChangedEvent_SetChangedWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPaletteChangedEvent_GetChangedWindow", (PyCFunction) _wrap_wxPaletteChangedEvent_GetChangedWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPaletteChangedEvent_swigregister", wxPaletteChangedEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxQueryNewPaletteEvent", (PyCFunction) _wrap_new_wxQueryNewPaletteEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxQueryNewPaletteEvent_SetPaletteRealized", (PyCFunction) _wrap_wxQueryNewPaletteEvent_SetPaletteRealized, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxQueryNewPaletteEvent_GetPaletteRealized", (PyCFunction) _wrap_wxQueryNewPaletteEvent_GetPaletteRealized, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxQueryNewPaletteEvent_swigregister", wxQueryNewPaletteEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxNavigationKeyEvent", (PyCFunction) _wrap_new_wxNavigationKeyEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNavigationKeyEvent_GetDirection", (PyCFunction) _wrap_wxNavigationKeyEvent_GetDirection, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNavigationKeyEvent_SetDirection", (PyCFunction) _wrap_wxNavigationKeyEvent_SetDirection, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNavigationKeyEvent_IsWindowChange", (PyCFunction) _wrap_wxNavigationKeyEvent_IsWindowChange, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNavigationKeyEvent_SetWindowChange", (PyCFunction) _wrap_wxNavigationKeyEvent_SetWindowChange, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNavigationKeyEvent_IsFromTab", (PyCFunction) _wrap_wxNavigationKeyEvent_IsFromTab, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNavigationKeyEvent_SetFromTab", (PyCFunction) _wrap_wxNavigationKeyEvent_SetFromTab, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNavigationKeyEvent_SetFlags", (PyCFunction) _wrap_wxNavigationKeyEvent_SetFlags, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNavigationKeyEvent_GetCurrentFocus", (PyCFunction) _wrap_wxNavigationKeyEvent_GetCurrentFocus, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNavigationKeyEvent_SetCurrentFocus", (PyCFunction) _wrap_wxNavigationKeyEvent_SetCurrentFocus, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxNavigationKeyEvent_swigregister", wxNavigationKeyEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxWindowCreateEvent", (PyCFunction) _wrap_new_wxWindowCreateEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindowCreateEvent_GetWindow", (PyCFunction) _wrap_wxWindowCreateEvent_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindowCreateEvent_swigregister", wxWindowCreateEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxWindowDestroyEvent", (PyCFunction) _wrap_new_wxWindowDestroyEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindowDestroyEvent_GetWindow", (PyCFunction) _wrap_wxWindowDestroyEvent_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindowDestroyEvent_swigregister", wxWindowDestroyEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxContextMenuEvent", (PyCFunction) _wrap_new_wxContextMenuEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxContextMenuEvent_GetPosition", (PyCFunction) _wrap_wxContextMenuEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxContextMenuEvent_SetPosition", (PyCFunction) _wrap_wxContextMenuEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxContextMenuEvent_swigregister", wxContextMenuEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxIdleEvent", (PyCFunction) _wrap_new_wxIdleEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIdleEvent_RequestMore", (PyCFunction) _wrap_wxIdleEvent_RequestMore, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIdleEvent_MoreRequested", (PyCFunction) _wrap_wxIdleEvent_MoreRequested, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIdleEvent_SetMode", (PyCFunction) _wrap_wxIdleEvent_SetMode, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIdleEvent_GetMode", (PyCFunction) _wrap_wxIdleEvent_GetMode, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIdleEvent_CanSend", (PyCFunction) _wrap_wxIdleEvent_CanSend, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIdleEvent_swigregister", wxIdleEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxPyEvent", (PyCFunction) _wrap_new_wxPyEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxPyEvent", (PyCFunction) _wrap_delete_wxPyEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyEvent_SetSelf", (PyCFunction) _wrap_wxPyEvent_SetSelf, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyEvent_GetSelf", (PyCFunction) _wrap_wxPyEvent_GetSelf, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyEvent_swigregister", wxPyEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxPyCommandEvent", (PyCFunction) _wrap_new_wxPyCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxPyCommandEvent", (PyCFunction) _wrap_delete_wxPyCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyCommandEvent_SetSelf", (PyCFunction) _wrap_wxPyCommandEvent_SetSelf, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyCommandEvent_GetSelf", (PyCFunction) _wrap_wxPyCommandEvent_GetSelf, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyCommandEvent_swigregister", wxPyCommandEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxDateEvent", (PyCFunction) _wrap_new_wxDateEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxDateEvent_GetDate", (PyCFunction) _wrap_wxDateEvent_GetDate, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxDateEvent_SetDate", (PyCFunction) _wrap_wxDateEvent_SetDate, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxDateEvent_swigregister", wxDateEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxPyApp", (PyCFunction) _wrap_new_wxPyApp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxPyApp", (PyCFunction) _wrap_delete_wxPyApp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp__setCallbackInfo", (PyCFunction) _wrap_wxPyApp__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetAppName", (PyCFunction) _wrap_wxPyApp_GetAppName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SetAppName", (PyCFunction) _wrap_wxPyApp_SetAppName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetClassName", (PyCFunction) _wrap_wxPyApp_GetClassName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SetClassName", (PyCFunction) _wrap_wxPyApp_SetClassName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetVendorName", (PyCFunction) _wrap_wxPyApp_GetVendorName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SetVendorName", (PyCFunction) _wrap_wxPyApp_SetVendorName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetTraits", (PyCFunction) _wrap_wxPyApp_GetTraits, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_ProcessPendingEvents", (PyCFunction) _wrap_wxPyApp_ProcessPendingEvents, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_Yield", (PyCFunction) _wrap_wxPyApp_Yield, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_WakeUpIdle", (PyCFunction) _wrap_wxPyApp_WakeUpIdle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_IsMainLoopRunning", (PyCFunction) _wrap_wxPyApp_IsMainLoopRunning, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_MainLoop", (PyCFunction) _wrap_wxPyApp_MainLoop, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_Exit", (PyCFunction) _wrap_wxPyApp_Exit, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_ExitMainLoop", (PyCFunction) _wrap_wxPyApp_ExitMainLoop, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_Pending", (PyCFunction) _wrap_wxPyApp_Pending, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_Dispatch", (PyCFunction) _wrap_wxPyApp_Dispatch, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_ProcessIdle", (PyCFunction) _wrap_wxPyApp_ProcessIdle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SendIdleEvents", (PyCFunction) _wrap_wxPyApp_SendIdleEvents, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_IsActive", (PyCFunction) _wrap_wxPyApp_IsActive, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SetTopWindow", (PyCFunction) _wrap_wxPyApp_SetTopWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetTopWindow", (PyCFunction) _wrap_wxPyApp_GetTopWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SetExitOnFrameDelete", (PyCFunction) _wrap_wxPyApp_SetExitOnFrameDelete, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetExitOnFrameDelete", (PyCFunction) _wrap_wxPyApp_GetExitOnFrameDelete, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SetUseBestVisual", (PyCFunction) _wrap_wxPyApp_SetUseBestVisual, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetUseBestVisual", (PyCFunction) _wrap_wxPyApp_GetUseBestVisual, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SetPrintMode", (PyCFunction) _wrap_wxPyApp_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetPrintMode", (PyCFunction) _wrap_wxPyApp_GetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SetAssertMode", (PyCFunction) _wrap_wxPyApp_SetAssertMode, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetAssertMode", (PyCFunction) _wrap_wxPyApp_GetAssertMode, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_wxPyApp_GetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetMacAboutMenuItemId", (PyCFunction) _wrap_wxPyApp_GetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetMacPreferencesMenuItemId", (PyCFunction) _wrap_wxPyApp_GetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetMacExitMenuItemId", (PyCFunction) _wrap_wxPyApp_GetMacExitMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetMacHelpMenuTitleName", (PyCFunction) _wrap_wxPyApp_GetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_wxPyApp_SetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SetMacAboutMenuItemId", (PyCFunction) _wrap_wxPyApp_SetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SetMacPreferencesMenuItemId", (PyCFunction) _wrap_wxPyApp_SetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SetMacExitMenuItemId", (PyCFunction) _wrap_wxPyApp_SetMacExitMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_SetMacHelpMenuTitleName", (PyCFunction) _wrap_wxPyApp_SetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp__BootstrapApp", (PyCFunction) _wrap_wxPyApp__BootstrapApp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_GetComCtl32Version", (PyCFunction) _wrap_wxPyApp_GetComCtl32Version, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyApp_swigregister", wxPyApp_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxExit", (PyCFunction) _wrap_wxExit, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxYield", (PyCFunction) _wrap_wxYield, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxYieldIfNeeded", (PyCFunction) _wrap_wxYieldIfNeeded, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSafeYield", (PyCFunction) _wrap_wxSafeYield, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWakeUpIdle", (PyCFunction) _wrap_wxWakeUpIdle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPostEvent", (PyCFunction) _wrap_wxPostEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxApp_CleanUp", (PyCFunction) _wrap_wxApp_CleanUp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_Create", (PyCFunction) _wrap_Image_Create, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_Destroy", (PyCFunction) _wrap_Image_Destroy, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_Scale", (PyCFunction) _wrap_Image_Scale, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_ShrinkBy", (PyCFunction) _wrap_Image_ShrinkBy, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_Rescale", (PyCFunction) _wrap_Image_Rescale, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_Resize", (PyCFunction) _wrap_Image_Resize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SetRGB", (PyCFunction) _wrap_Image_SetRGB, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SetRGBRect", (PyCFunction) _wrap_Image_SetRGBRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetRed", (PyCFunction) _wrap_Image_GetRed, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetGreen", (PyCFunction) _wrap_Image_GetGreen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetBlue", (PyCFunction) _wrap_Image_GetBlue, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SetAlpha", (PyCFunction) _wrap_Image_SetAlpha, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetAlpha", (PyCFunction) _wrap_Image_GetAlpha, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_HasAlpha", (PyCFunction) _wrap_Image_HasAlpha, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_InitAlpha", (PyCFunction) _wrap_Image_InitAlpha, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_IsTransparent", (PyCFunction) _wrap_Image_IsTransparent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_FindFirstUnusedColour", (PyCFunction) _wrap_Image_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_ConvertAlphaToMask", (PyCFunction) _wrap_Image_ConvertAlphaToMask, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_ConvertColourToAlpha", (PyCFunction) _wrap_Image_ConvertColourToAlpha, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SetMaskFromImage", (PyCFunction) _wrap_Image_SetMaskFromImage, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_CanRead", (PyCFunction) _wrap_Image_CanRead, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetImageCount", (PyCFunction) _wrap_Image_GetImageCount, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_LoadFile", (PyCFunction) _wrap_Image_LoadFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_LoadMimeFile", (PyCFunction) _wrap_Image_LoadMimeFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SaveFile", (PyCFunction) _wrap_Image_SaveFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SaveMimeFile", (PyCFunction) _wrap_Image_SaveMimeFile, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_CanReadStream", (PyCFunction) _wrap_Image_CanReadStream, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_LoadStream", (PyCFunction) _wrap_Image_LoadStream, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_LoadMimeStream", (PyCFunction) _wrap_Image_LoadMimeStream, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_Ok", (PyCFunction) _wrap_Image_Ok, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetWidth", (PyCFunction) _wrap_Image_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetHeight", (PyCFunction) _wrap_Image_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetSize", (PyCFunction) _wrap_Image_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetSubImage", (PyCFunction) _wrap_Image_GetSubImage, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_Size", (PyCFunction) _wrap_Image_Size, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_Copy", (PyCFunction) _wrap_Image_Copy, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_Paste", (PyCFunction) _wrap_Image_Paste, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetData", (PyCFunction) _wrap_Image_GetData, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SetData", (PyCFunction) _wrap_Image_SetData, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetDataBuffer", (PyCFunction) _wrap_Image_GetDataBuffer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SetDataBuffer", (PyCFunction) _wrap_Image_SetDataBuffer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetAlphaData", (PyCFunction) _wrap_Image_GetAlphaData, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SetAlphaData", (PyCFunction) _wrap_Image_SetAlphaData, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetAlphaBuffer", (PyCFunction) _wrap_Image_GetAlphaBuffer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SetAlphaBuffer", (PyCFunction) _wrap_Image_SetAlphaBuffer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SetMaskColour", (PyCFunction) _wrap_Image_SetMaskColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetOrFindMaskColour", (PyCFunction) _wrap_Image_GetOrFindMaskColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetMaskRed", (PyCFunction) _wrap_Image_GetMaskRed, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetMaskGreen", (PyCFunction) _wrap_Image_GetMaskGreen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetMaskBlue", (PyCFunction) _wrap_Image_GetMaskBlue, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SetMask", (PyCFunction) _wrap_Image_SetMask, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_HasMask", (PyCFunction) _wrap_Image_HasMask, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_Rotate", (PyCFunction) _wrap_Image_Rotate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_Rotate90", (PyCFunction) _wrap_Image_Rotate90, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_Mirror", (PyCFunction) _wrap_Image_Mirror, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_Replace", (PyCFunction) _wrap_Image_Replace, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_ConvertToMono", (PyCFunction) _wrap_Image_ConvertToMono, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SetOption", (PyCFunction) _wrap_Image_SetOption, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_SetOptionInt", (PyCFunction) _wrap_Image_SetOptionInt, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetOption", (PyCFunction) _wrap_Image_GetOption, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetOptionInt", (PyCFunction) _wrap_Image_GetOptionInt, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_HasOption", (PyCFunction) _wrap_Image_HasOption, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_CountColours", (PyCFunction) _wrap_Image_CountColours, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_ComputeHistogram", (PyCFunction) _wrap_Image_ComputeHistogram, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_AddHandler", (PyCFunction) _wrap_Image_AddHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_InsertHandler", (PyCFunction) _wrap_Image_InsertHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_RemoveHandler", (PyCFunction) _wrap_Image_RemoveHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_GetImageExtWildcard", (PyCFunction) _wrap_Image_GetImageExtWildcard, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_ConvertToBitmap", (PyCFunction) _wrap_Image_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_ConvertToMonoBitmap", (PyCFunction) _wrap_Image_ConvertToMonoBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Image_swigregister", Image_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_BMPHandler", (PyCFunction) _wrap_new_BMPHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"BMPHandler_swigregister", BMPHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_ICOHandler", (PyCFunction) _wrap_new_ICOHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ICOHandler_swigregister", ICOHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_CURHandler", (PyCFunction) _wrap_new_CURHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CURHandler_swigregister", CURHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_ANIHandler", (PyCFunction) _wrap_new_ANIHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ANIHandler_swigregister", ANIHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PNGHandler", (PyCFunction) _wrap_new_PNGHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PNGHandler_swigregister", PNGHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_GIFHandler", (PyCFunction) _wrap_new_GIFHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GIFHandler_swigregister", GIFHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PCXHandler", (PyCFunction) _wrap_new_PCXHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PCXHandler_swigregister", PCXHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_JPEGHandler", (PyCFunction) _wrap_new_JPEGHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"JPEGHandler_swigregister", JPEGHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PNMHandler", (PyCFunction) _wrap_new_PNMHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PNMHandler_swigregister", PNMHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_XPMHandler", (PyCFunction) _wrap_new_XPMHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"XPMHandler_swigregister", XPMHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_TIFFHandler", (PyCFunction) _wrap_new_TIFFHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TIFFHandler_swigregister", TIFFHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"Quantize_Quantize", (PyCFunction) _wrap_Quantize_Quantize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Quantize_swigregister", Quantize_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_EvtHandler", (PyCFunction) _wrap_new_EvtHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EvtHandler_GetNextHandler", (PyCFunction) _wrap_EvtHandler_GetNextHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EvtHandler_GetPreviousHandler", (PyCFunction) _wrap_EvtHandler_GetPreviousHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EvtHandler_SetNextHandler", (PyCFunction) _wrap_EvtHandler_SetNextHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EvtHandler_SetPreviousHandler", (PyCFunction) _wrap_EvtHandler_SetPreviousHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EvtHandler_GetEvtHandlerEnabled", (PyCFunction) _wrap_EvtHandler_GetEvtHandlerEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EvtHandler_SetEvtHandlerEnabled", (PyCFunction) _wrap_EvtHandler_SetEvtHandlerEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EvtHandler_ProcessEvent", (PyCFunction) _wrap_EvtHandler_ProcessEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EvtHandler_AddPendingEvent", (PyCFunction) _wrap_EvtHandler_AddPendingEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EvtHandler_ProcessPendingEvents", (PyCFunction) _wrap_EvtHandler_ProcessPendingEvents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EvtHandler_Connect", (PyCFunction) _wrap_EvtHandler_Connect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EvtHandler_Disconnect", (PyCFunction) _wrap_EvtHandler_Disconnect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EvtHandler__setOORInfo", (PyCFunction) _wrap_EvtHandler__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EvtHandler_swigregister", EvtHandler_swigregister, METH_VARARGS, NULL},
+        { (char *)"NewEventType", (PyCFunction) _wrap_NewEventType, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_Event", (PyCFunction) _wrap_delete_Event, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_SetEventType", (PyCFunction) _wrap_Event_SetEventType, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_GetEventType", (PyCFunction) _wrap_Event_GetEventType, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_GetEventObject", (PyCFunction) _wrap_Event_GetEventObject, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_SetEventObject", (PyCFunction) _wrap_Event_SetEventObject, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_GetTimestamp", (PyCFunction) _wrap_Event_GetTimestamp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_SetTimestamp", (PyCFunction) _wrap_Event_SetTimestamp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_GetId", (PyCFunction) _wrap_Event_GetId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_SetId", (PyCFunction) _wrap_Event_SetId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_IsCommandEvent", (PyCFunction) _wrap_Event_IsCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_Skip", (PyCFunction) _wrap_Event_Skip, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_GetSkipped", (PyCFunction) _wrap_Event_GetSkipped, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_ShouldPropagate", (PyCFunction) _wrap_Event_ShouldPropagate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_StopPropagation", (PyCFunction) _wrap_Event_StopPropagation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_ResumePropagation", (PyCFunction) _wrap_Event_ResumePropagation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_Clone", (PyCFunction) _wrap_Event_Clone, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Event_swigregister", Event_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PropagationDisabler", (PyCFunction) _wrap_new_PropagationDisabler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_PropagationDisabler", (PyCFunction) _wrap_delete_PropagationDisabler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PropagationDisabler_swigregister", PropagationDisabler_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PropagateOnce", (PyCFunction) _wrap_new_PropagateOnce, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_PropagateOnce", (PyCFunction) _wrap_delete_PropagateOnce, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PropagateOnce_swigregister", PropagateOnce_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_CommandEvent", (PyCFunction) _wrap_new_CommandEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CommandEvent_GetSelection", (PyCFunction) _wrap_CommandEvent_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CommandEvent_SetString", (PyCFunction) _wrap_CommandEvent_SetString, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CommandEvent_GetString", (PyCFunction) _wrap_CommandEvent_GetString, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CommandEvent_IsChecked", (PyCFunction) _wrap_CommandEvent_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CommandEvent_IsSelection", (PyCFunction) _wrap_CommandEvent_IsSelection, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CommandEvent_SetExtraLong", (PyCFunction) _wrap_CommandEvent_SetExtraLong, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CommandEvent_GetExtraLong", (PyCFunction) _wrap_CommandEvent_GetExtraLong, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CommandEvent_SetInt", (PyCFunction) _wrap_CommandEvent_SetInt, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CommandEvent_GetInt", (PyCFunction) _wrap_CommandEvent_GetInt, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CommandEvent_Clone", (PyCFunction) _wrap_CommandEvent_Clone, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CommandEvent_swigregister", CommandEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_NotifyEvent", (PyCFunction) _wrap_new_NotifyEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NotifyEvent_Veto", (PyCFunction) _wrap_NotifyEvent_Veto, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NotifyEvent_Allow", (PyCFunction) _wrap_NotifyEvent_Allow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NotifyEvent_IsAllowed", (PyCFunction) _wrap_NotifyEvent_IsAllowed, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NotifyEvent_swigregister", NotifyEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_ScrollEvent", (PyCFunction) _wrap_new_ScrollEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ScrollEvent_GetOrientation", (PyCFunction) _wrap_ScrollEvent_GetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ScrollEvent_GetPosition", (PyCFunction) _wrap_ScrollEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ScrollEvent_SetOrientation", (PyCFunction) _wrap_ScrollEvent_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ScrollEvent_SetPosition", (PyCFunction) _wrap_ScrollEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ScrollEvent_swigregister", ScrollEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_ScrollWinEvent", (PyCFunction) _wrap_new_ScrollWinEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ScrollWinEvent_GetOrientation", (PyCFunction) _wrap_ScrollWinEvent_GetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ScrollWinEvent_GetPosition", (PyCFunction) _wrap_ScrollWinEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ScrollWinEvent_SetOrientation", (PyCFunction) _wrap_ScrollWinEvent_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ScrollWinEvent_SetPosition", (PyCFunction) _wrap_ScrollWinEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ScrollWinEvent_swigregister", ScrollWinEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_MouseEvent", (PyCFunction) _wrap_new_MouseEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_IsButton", (PyCFunction) _wrap_MouseEvent_IsButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_ButtonDown", (PyCFunction) _wrap_MouseEvent_ButtonDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_ButtonDClick", (PyCFunction) _wrap_MouseEvent_ButtonDClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_ButtonUp", (PyCFunction) _wrap_MouseEvent_ButtonUp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_Button", (PyCFunction) _wrap_MouseEvent_Button, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_ButtonIsDown", (PyCFunction) _wrap_MouseEvent_ButtonIsDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_GetButton", (PyCFunction) _wrap_MouseEvent_GetButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_ControlDown", (PyCFunction) _wrap_MouseEvent_ControlDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_MetaDown", (PyCFunction) _wrap_MouseEvent_MetaDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_AltDown", (PyCFunction) _wrap_MouseEvent_AltDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_ShiftDown", (PyCFunction) _wrap_MouseEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_CmdDown", (PyCFunction) _wrap_MouseEvent_CmdDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_LeftDown", (PyCFunction) _wrap_MouseEvent_LeftDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_MiddleDown", (PyCFunction) _wrap_MouseEvent_MiddleDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_RightDown", (PyCFunction) _wrap_MouseEvent_RightDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_LeftUp", (PyCFunction) _wrap_MouseEvent_LeftUp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_MiddleUp", (PyCFunction) _wrap_MouseEvent_MiddleUp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_RightUp", (PyCFunction) _wrap_MouseEvent_RightUp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_LeftDClick", (PyCFunction) _wrap_MouseEvent_LeftDClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_MiddleDClick", (PyCFunction) _wrap_MouseEvent_MiddleDClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_RightDClick", (PyCFunction) _wrap_MouseEvent_RightDClick, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_LeftIsDown", (PyCFunction) _wrap_MouseEvent_LeftIsDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_MiddleIsDown", (PyCFunction) _wrap_MouseEvent_MiddleIsDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_RightIsDown", (PyCFunction) _wrap_MouseEvent_RightIsDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_Dragging", (PyCFunction) _wrap_MouseEvent_Dragging, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_Moving", (PyCFunction) _wrap_MouseEvent_Moving, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_Entering", (PyCFunction) _wrap_MouseEvent_Entering, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_Leaving", (PyCFunction) _wrap_MouseEvent_Leaving, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_GetPosition", (PyCFunction) _wrap_MouseEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_GetPositionTuple", (PyCFunction) _wrap_MouseEvent_GetPositionTuple, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_GetLogicalPosition", (PyCFunction) _wrap_MouseEvent_GetLogicalPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_GetX", (PyCFunction) _wrap_MouseEvent_GetX, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_GetY", (PyCFunction) _wrap_MouseEvent_GetY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_GetWheelRotation", (PyCFunction) _wrap_MouseEvent_GetWheelRotation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_GetWheelDelta", (PyCFunction) _wrap_MouseEvent_GetWheelDelta, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_GetLinesPerAction", (PyCFunction) _wrap_MouseEvent_GetLinesPerAction, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_IsPageScroll", (PyCFunction) _wrap_MouseEvent_IsPageScroll, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_x_set", (PyCFunction) _wrap_MouseEvent_m_x_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_x_get", (PyCFunction) _wrap_MouseEvent_m_x_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_y_set", (PyCFunction) _wrap_MouseEvent_m_y_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_y_get", (PyCFunction) _wrap_MouseEvent_m_y_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_leftDown_set", (PyCFunction) _wrap_MouseEvent_m_leftDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_leftDown_get", (PyCFunction) _wrap_MouseEvent_m_leftDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_middleDown_set", (PyCFunction) _wrap_MouseEvent_m_middleDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_middleDown_get", (PyCFunction) _wrap_MouseEvent_m_middleDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_rightDown_set", (PyCFunction) _wrap_MouseEvent_m_rightDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_rightDown_get", (PyCFunction) _wrap_MouseEvent_m_rightDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_controlDown_set", (PyCFunction) _wrap_MouseEvent_m_controlDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_controlDown_get", (PyCFunction) _wrap_MouseEvent_m_controlDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_shiftDown_set", (PyCFunction) _wrap_MouseEvent_m_shiftDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_shiftDown_get", (PyCFunction) _wrap_MouseEvent_m_shiftDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_altDown_set", (PyCFunction) _wrap_MouseEvent_m_altDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_altDown_get", (PyCFunction) _wrap_MouseEvent_m_altDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_metaDown_set", (PyCFunction) _wrap_MouseEvent_m_metaDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_metaDown_get", (PyCFunction) _wrap_MouseEvent_m_metaDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_wheelRotation_set", (PyCFunction) _wrap_MouseEvent_m_wheelRotation_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_wheelRotation_get", (PyCFunction) _wrap_MouseEvent_m_wheelRotation_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_wheelDelta_set", (PyCFunction) _wrap_MouseEvent_m_wheelDelta_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_wheelDelta_get", (PyCFunction) _wrap_MouseEvent_m_wheelDelta_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_linesPerAction_set", (PyCFunction) _wrap_MouseEvent_m_linesPerAction_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_m_linesPerAction_get", (PyCFunction) _wrap_MouseEvent_m_linesPerAction_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseEvent_swigregister", MouseEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_SetCursorEvent", (PyCFunction) _wrap_new_SetCursorEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SetCursorEvent_GetX", (PyCFunction) _wrap_SetCursorEvent_GetX, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SetCursorEvent_GetY", (PyCFunction) _wrap_SetCursorEvent_GetY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SetCursorEvent_SetCursor", (PyCFunction) _wrap_SetCursorEvent_SetCursor, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SetCursorEvent_GetCursor", (PyCFunction) _wrap_SetCursorEvent_GetCursor, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SetCursorEvent_HasCursor", (PyCFunction) _wrap_SetCursorEvent_HasCursor, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SetCursorEvent_swigregister", SetCursorEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_KeyEvent", (PyCFunction) _wrap_new_KeyEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_ControlDown", (PyCFunction) _wrap_KeyEvent_ControlDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_MetaDown", (PyCFunction) _wrap_KeyEvent_MetaDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_AltDown", (PyCFunction) _wrap_KeyEvent_AltDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_ShiftDown", (PyCFunction) _wrap_KeyEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_CmdDown", (PyCFunction) _wrap_KeyEvent_CmdDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_HasModifiers", (PyCFunction) _wrap_KeyEvent_HasModifiers, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_GetKeyCode", (PyCFunction) _wrap_KeyEvent_GetKeyCode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_GetUnicodeKey", (PyCFunction) _wrap_KeyEvent_GetUnicodeKey, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_GetRawKeyCode", (PyCFunction) _wrap_KeyEvent_GetRawKeyCode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_GetRawKeyFlags", (PyCFunction) _wrap_KeyEvent_GetRawKeyFlags, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_GetPosition", (PyCFunction) _wrap_KeyEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_GetPositionTuple", (PyCFunction) _wrap_KeyEvent_GetPositionTuple, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_GetX", (PyCFunction) _wrap_KeyEvent_GetX, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_GetY", (PyCFunction) _wrap_KeyEvent_GetY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_x_set", (PyCFunction) _wrap_KeyEvent_m_x_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_x_get", (PyCFunction) _wrap_KeyEvent_m_x_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_y_set", (PyCFunction) _wrap_KeyEvent_m_y_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_y_get", (PyCFunction) _wrap_KeyEvent_m_y_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_keyCode_set", (PyCFunction) _wrap_KeyEvent_m_keyCode_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_keyCode_get", (PyCFunction) _wrap_KeyEvent_m_keyCode_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_controlDown_set", (PyCFunction) _wrap_KeyEvent_m_controlDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_controlDown_get", (PyCFunction) _wrap_KeyEvent_m_controlDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_shiftDown_set", (PyCFunction) _wrap_KeyEvent_m_shiftDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_shiftDown_get", (PyCFunction) _wrap_KeyEvent_m_shiftDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_altDown_set", (PyCFunction) _wrap_KeyEvent_m_altDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_altDown_get", (PyCFunction) _wrap_KeyEvent_m_altDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_metaDown_set", (PyCFunction) _wrap_KeyEvent_m_metaDown_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_metaDown_get", (PyCFunction) _wrap_KeyEvent_m_metaDown_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_scanCode_set", (PyCFunction) _wrap_KeyEvent_m_scanCode_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_scanCode_get", (PyCFunction) _wrap_KeyEvent_m_scanCode_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_rawCode_set", (PyCFunction) _wrap_KeyEvent_m_rawCode_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_rawCode_get", (PyCFunction) _wrap_KeyEvent_m_rawCode_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_rawFlags_set", (PyCFunction) _wrap_KeyEvent_m_rawFlags_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_m_rawFlags_get", (PyCFunction) _wrap_KeyEvent_m_rawFlags_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"KeyEvent_swigregister", KeyEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_SizeEvent", (PyCFunction) _wrap_new_SizeEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizeEvent_GetSize", (PyCFunction) _wrap_SizeEvent_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizeEvent_GetRect", (PyCFunction) _wrap_SizeEvent_GetRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizeEvent_SetRect", (PyCFunction) _wrap_SizeEvent_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizeEvent_SetSize", (PyCFunction) _wrap_SizeEvent_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizeEvent_m_size_set", (PyCFunction) _wrap_SizeEvent_m_size_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizeEvent_m_size_get", (PyCFunction) _wrap_SizeEvent_m_size_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizeEvent_m_rect_set", (PyCFunction) _wrap_SizeEvent_m_rect_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizeEvent_m_rect_get", (PyCFunction) _wrap_SizeEvent_m_rect_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizeEvent_swigregister", SizeEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_MoveEvent", (PyCFunction) _wrap_new_MoveEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MoveEvent_GetPosition", (PyCFunction) _wrap_MoveEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MoveEvent_GetRect", (PyCFunction) _wrap_MoveEvent_GetRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MoveEvent_SetRect", (PyCFunction) _wrap_MoveEvent_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MoveEvent_SetPosition", (PyCFunction) _wrap_MoveEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MoveEvent_swigregister", MoveEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PaintEvent", (PyCFunction) _wrap_new_PaintEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PaintEvent_swigregister", PaintEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_NcPaintEvent", (PyCFunction) _wrap_new_NcPaintEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NcPaintEvent_swigregister", NcPaintEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_EraseEvent", (PyCFunction) _wrap_new_EraseEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EraseEvent_GetDC", (PyCFunction) _wrap_EraseEvent_GetDC, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EraseEvent_swigregister", EraseEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_FocusEvent", (PyCFunction) _wrap_new_FocusEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FocusEvent_GetWindow", (PyCFunction) _wrap_FocusEvent_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FocusEvent_SetWindow", (PyCFunction) _wrap_FocusEvent_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FocusEvent_swigregister", FocusEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_ChildFocusEvent", (PyCFunction) _wrap_new_ChildFocusEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ChildFocusEvent_GetWindow", (PyCFunction) _wrap_ChildFocusEvent_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ChildFocusEvent_swigregister", ChildFocusEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_ActivateEvent", (PyCFunction) _wrap_new_ActivateEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ActivateEvent_GetActive", (PyCFunction) _wrap_ActivateEvent_GetActive, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ActivateEvent_swigregister", ActivateEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_InitDialogEvent", (PyCFunction) _wrap_new_InitDialogEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"InitDialogEvent_swigregister", InitDialogEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_MenuEvent", (PyCFunction) _wrap_new_MenuEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuEvent_GetMenuId", (PyCFunction) _wrap_MenuEvent_GetMenuId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuEvent_IsPopup", (PyCFunction) _wrap_MenuEvent_IsPopup, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuEvent_GetMenu", (PyCFunction) _wrap_MenuEvent_GetMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuEvent_swigregister", MenuEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_CloseEvent", (PyCFunction) _wrap_new_CloseEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CloseEvent_SetLoggingOff", (PyCFunction) _wrap_CloseEvent_SetLoggingOff, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CloseEvent_GetLoggingOff", (PyCFunction) _wrap_CloseEvent_GetLoggingOff, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CloseEvent_Veto", (PyCFunction) _wrap_CloseEvent_Veto, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CloseEvent_GetVeto", (PyCFunction) _wrap_CloseEvent_GetVeto, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CloseEvent_SetCanVeto", (PyCFunction) _wrap_CloseEvent_SetCanVeto, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CloseEvent_CanVeto", (PyCFunction) _wrap_CloseEvent_CanVeto, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"CloseEvent_swigregister", CloseEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_ShowEvent", (PyCFunction) _wrap_new_ShowEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShowEvent_SetShow", (PyCFunction) _wrap_ShowEvent_SetShow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShowEvent_GetShow", (PyCFunction) _wrap_ShowEvent_GetShow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ShowEvent_swigregister", ShowEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_IconizeEvent", (PyCFunction) _wrap_new_IconizeEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IconizeEvent_Iconized", (PyCFunction) _wrap_IconizeEvent_Iconized, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IconizeEvent_swigregister", IconizeEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_MaximizeEvent", (PyCFunction) _wrap_new_MaximizeEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MaximizeEvent_swigregister", MaximizeEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"DropFilesEvent_GetPosition", (PyCFunction) _wrap_DropFilesEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"DropFilesEvent_GetNumberOfFiles", (PyCFunction) _wrap_DropFilesEvent_GetNumberOfFiles, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"DropFilesEvent_GetFiles", (PyCFunction) _wrap_DropFilesEvent_GetFiles, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"DropFilesEvent_swigregister", DropFilesEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_UpdateUIEvent", (PyCFunction) _wrap_new_UpdateUIEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_GetChecked", (PyCFunction) _wrap_UpdateUIEvent_GetChecked, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_GetEnabled", (PyCFunction) _wrap_UpdateUIEvent_GetEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_GetText", (PyCFunction) _wrap_UpdateUIEvent_GetText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_GetSetText", (PyCFunction) _wrap_UpdateUIEvent_GetSetText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_GetSetChecked", (PyCFunction) _wrap_UpdateUIEvent_GetSetChecked, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_GetSetEnabled", (PyCFunction) _wrap_UpdateUIEvent_GetSetEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_Check", (PyCFunction) _wrap_UpdateUIEvent_Check, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_Enable", (PyCFunction) _wrap_UpdateUIEvent_Enable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_SetText", (PyCFunction) _wrap_UpdateUIEvent_SetText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_SetUpdateInterval", (PyCFunction) _wrap_UpdateUIEvent_SetUpdateInterval, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_GetUpdateInterval", (PyCFunction) _wrap_UpdateUIEvent_GetUpdateInterval, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_CanUpdate", (PyCFunction) _wrap_UpdateUIEvent_CanUpdate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_ResetUpdateTime", (PyCFunction) _wrap_UpdateUIEvent_ResetUpdateTime, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_SetMode", (PyCFunction) _wrap_UpdateUIEvent_SetMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_GetMode", (PyCFunction) _wrap_UpdateUIEvent_GetMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"UpdateUIEvent_swigregister", UpdateUIEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_SysColourChangedEvent", (PyCFunction) _wrap_new_SysColourChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SysColourChangedEvent_swigregister", SysColourChangedEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_MouseCaptureChangedEvent", (PyCFunction) _wrap_new_MouseCaptureChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseCaptureChangedEvent_GetCapturedWindow", (PyCFunction) _wrap_MouseCaptureChangedEvent_GetCapturedWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MouseCaptureChangedEvent_swigregister", MouseCaptureChangedEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_DisplayChangedEvent", (PyCFunction) _wrap_new_DisplayChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"DisplayChangedEvent_swigregister", DisplayChangedEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PaletteChangedEvent", (PyCFunction) _wrap_new_PaletteChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PaletteChangedEvent_SetChangedWindow", (PyCFunction) _wrap_PaletteChangedEvent_SetChangedWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PaletteChangedEvent_GetChangedWindow", (PyCFunction) _wrap_PaletteChangedEvent_GetChangedWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PaletteChangedEvent_swigregister", PaletteChangedEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_QueryNewPaletteEvent", (PyCFunction) _wrap_new_QueryNewPaletteEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"QueryNewPaletteEvent_SetPaletteRealized", (PyCFunction) _wrap_QueryNewPaletteEvent_SetPaletteRealized, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"QueryNewPaletteEvent_GetPaletteRealized", (PyCFunction) _wrap_QueryNewPaletteEvent_GetPaletteRealized, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"QueryNewPaletteEvent_swigregister", QueryNewPaletteEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_NavigationKeyEvent", (PyCFunction) _wrap_new_NavigationKeyEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NavigationKeyEvent_GetDirection", (PyCFunction) _wrap_NavigationKeyEvent_GetDirection, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NavigationKeyEvent_SetDirection", (PyCFunction) _wrap_NavigationKeyEvent_SetDirection, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NavigationKeyEvent_IsWindowChange", (PyCFunction) _wrap_NavigationKeyEvent_IsWindowChange, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NavigationKeyEvent_SetWindowChange", (PyCFunction) _wrap_NavigationKeyEvent_SetWindowChange, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NavigationKeyEvent_IsFromTab", (PyCFunction) _wrap_NavigationKeyEvent_IsFromTab, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NavigationKeyEvent_SetFromTab", (PyCFunction) _wrap_NavigationKeyEvent_SetFromTab, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NavigationKeyEvent_SetFlags", (PyCFunction) _wrap_NavigationKeyEvent_SetFlags, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NavigationKeyEvent_GetCurrentFocus", (PyCFunction) _wrap_NavigationKeyEvent_GetCurrentFocus, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NavigationKeyEvent_SetCurrentFocus", (PyCFunction) _wrap_NavigationKeyEvent_SetCurrentFocus, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NavigationKeyEvent_swigregister", NavigationKeyEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_WindowCreateEvent", (PyCFunction) _wrap_new_WindowCreateEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"WindowCreateEvent_GetWindow", (PyCFunction) _wrap_WindowCreateEvent_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"WindowCreateEvent_swigregister", WindowCreateEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_WindowDestroyEvent", (PyCFunction) _wrap_new_WindowDestroyEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"WindowDestroyEvent_GetWindow", (PyCFunction) _wrap_WindowDestroyEvent_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"WindowDestroyEvent_swigregister", WindowDestroyEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_ContextMenuEvent", (PyCFunction) _wrap_new_ContextMenuEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ContextMenuEvent_GetPosition", (PyCFunction) _wrap_ContextMenuEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ContextMenuEvent_SetPosition", (PyCFunction) _wrap_ContextMenuEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ContextMenuEvent_swigregister", ContextMenuEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_IdleEvent", (PyCFunction) _wrap_new_IdleEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IdleEvent_RequestMore", (PyCFunction) _wrap_IdleEvent_RequestMore, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IdleEvent_MoreRequested", (PyCFunction) _wrap_IdleEvent_MoreRequested, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IdleEvent_SetMode", (PyCFunction) _wrap_IdleEvent_SetMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IdleEvent_GetMode", (PyCFunction) _wrap_IdleEvent_GetMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IdleEvent_CanSend", (PyCFunction) _wrap_IdleEvent_CanSend, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IdleEvent_swigregister", IdleEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyEvent", (PyCFunction) _wrap_new_PyEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_PyEvent", (PyCFunction) _wrap_delete_PyEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEvent__SetSelf", (PyCFunction) _wrap_PyEvent__SetSelf, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEvent__GetSelf", (PyCFunction) _wrap_PyEvent__GetSelf, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyEvent_swigregister", PyEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyCommandEvent", (PyCFunction) _wrap_new_PyCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_PyCommandEvent", (PyCFunction) _wrap_delete_PyCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCommandEvent__SetSelf", (PyCFunction) _wrap_PyCommandEvent__SetSelf, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCommandEvent__GetSelf", (PyCFunction) _wrap_PyCommandEvent__GetSelf, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyCommandEvent_swigregister", PyCommandEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_DateEvent", (PyCFunction) _wrap_new_DateEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"DateEvent_GetDate", (PyCFunction) _wrap_DateEvent_GetDate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"DateEvent_SetDate", (PyCFunction) _wrap_DateEvent_SetDate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"DateEvent_swigregister", DateEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyApp", (PyCFunction) _wrap_new_PyApp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_PyApp", (PyCFunction) _wrap_delete_PyApp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp__setCallbackInfo", (PyCFunction) _wrap_PyApp__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetAppName", (PyCFunction) _wrap_PyApp_GetAppName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SetAppName", (PyCFunction) _wrap_PyApp_SetAppName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetClassName", (PyCFunction) _wrap_PyApp_GetClassName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SetClassName", (PyCFunction) _wrap_PyApp_SetClassName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetVendorName", (PyCFunction) _wrap_PyApp_GetVendorName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SetVendorName", (PyCFunction) _wrap_PyApp_SetVendorName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetTraits", (PyCFunction) _wrap_PyApp_GetTraits, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_ProcessPendingEvents", (PyCFunction) _wrap_PyApp_ProcessPendingEvents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_Yield", (PyCFunction) _wrap_PyApp_Yield, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_WakeUpIdle", (PyCFunction) _wrap_PyApp_WakeUpIdle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_IsMainLoopRunning", (PyCFunction) _wrap_PyApp_IsMainLoopRunning, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_MainLoop", (PyCFunction) _wrap_PyApp_MainLoop, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_Exit", (PyCFunction) _wrap_PyApp_Exit, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_ExitMainLoop", (PyCFunction) _wrap_PyApp_ExitMainLoop, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_Pending", (PyCFunction) _wrap_PyApp_Pending, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_Dispatch", (PyCFunction) _wrap_PyApp_Dispatch, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_ProcessIdle", (PyCFunction) _wrap_PyApp_ProcessIdle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SendIdleEvents", (PyCFunction) _wrap_PyApp_SendIdleEvents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_IsActive", (PyCFunction) _wrap_PyApp_IsActive, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SetTopWindow", (PyCFunction) _wrap_PyApp_SetTopWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetTopWindow", (PyCFunction) _wrap_PyApp_GetTopWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SetExitOnFrameDelete", (PyCFunction) _wrap_PyApp_SetExitOnFrameDelete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetExitOnFrameDelete", (PyCFunction) _wrap_PyApp_GetExitOnFrameDelete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SetUseBestVisual", (PyCFunction) _wrap_PyApp_SetUseBestVisual, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetUseBestVisual", (PyCFunction) _wrap_PyApp_GetUseBestVisual, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SetPrintMode", (PyCFunction) _wrap_PyApp_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetPrintMode", (PyCFunction) _wrap_PyApp_GetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SetAssertMode", (PyCFunction) _wrap_PyApp_SetAssertMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetAssertMode", (PyCFunction) _wrap_PyApp_GetAssertMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_PyApp_GetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetMacAboutMenuItemId", (PyCFunction) _wrap_PyApp_GetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetMacPreferencesMenuItemId", (PyCFunction) _wrap_PyApp_GetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetMacExitMenuItemId", (PyCFunction) _wrap_PyApp_GetMacExitMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetMacHelpMenuTitleName", (PyCFunction) _wrap_PyApp_GetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_PyApp_SetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SetMacAboutMenuItemId", (PyCFunction) _wrap_PyApp_SetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SetMacPreferencesMenuItemId", (PyCFunction) _wrap_PyApp_SetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SetMacExitMenuItemId", (PyCFunction) _wrap_PyApp_SetMacExitMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_SetMacHelpMenuTitleName", (PyCFunction) _wrap_PyApp_SetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp__BootstrapApp", (PyCFunction) _wrap_PyApp__BootstrapApp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_GetComCtl32Version", (PyCFunction) _wrap_PyApp_GetComCtl32Version, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyApp_swigregister", PyApp_swigregister, METH_VARARGS, NULL},
+        { (char *)"Exit", (PyCFunction) _wrap_Exit, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Yield", (PyCFunction) _wrap_Yield, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"YieldIfNeeded", (PyCFunction) _wrap_YieldIfNeeded, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SafeYield", (PyCFunction) _wrap_SafeYield, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"WakeUpIdle", (PyCFunction) _wrap_WakeUpIdle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PostEvent", (PyCFunction) _wrap_PostEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"App_CleanUp", (PyCFunction) _wrap_App_CleanUp, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GetApp", (PyCFunction) _wrap_GetApp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSetDefaultPyEncoding", (PyCFunction) _wrap_wxSetDefaultPyEncoding, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGetDefaultPyEncoding", (PyCFunction) _wrap_wxGetDefaultPyEncoding, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"new_wxEventLoop", (PyCFunction) _wrap_new_wxEventLoop, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxEventLoop", (PyCFunction) _wrap_delete_wxEventLoop, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEventLoop_Run", (PyCFunction) _wrap_wxEventLoop_Run, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEventLoop_Exit", (PyCFunction) _wrap_wxEventLoop_Exit, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEventLoop_Pending", (PyCFunction) _wrap_wxEventLoop_Pending, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEventLoop_Dispatch", (PyCFunction) _wrap_wxEventLoop_Dispatch, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEventLoop_IsRunning", (PyCFunction) _wrap_wxEventLoop_IsRunning, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEventLoop_GetActive", (PyCFunction) _wrap_wxEventLoop_GetActive, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEventLoop_SetActive", (PyCFunction) _wrap_wxEventLoop_SetActive, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxEventLoop_swigregister", wxEventLoop_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxAcceleratorEntry", (PyCFunction) _wrap_new_wxAcceleratorEntry, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxAcceleratorEntry", (PyCFunction) _wrap_delete_wxAcceleratorEntry, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxAcceleratorEntry_Set", (PyCFunction) _wrap_wxAcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxAcceleratorEntry_GetFlags", (PyCFunction) _wrap_wxAcceleratorEntry_GetFlags, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxAcceleratorEntry_GetKeyCode", (PyCFunction) _wrap_wxAcceleratorEntry_GetKeyCode, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxAcceleratorEntry_GetCommand", (PyCFunction) _wrap_wxAcceleratorEntry_GetCommand, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxAcceleratorEntry_swigregister", wxAcceleratorEntry_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxAcceleratorTable", (PyCFunction) _wrap_new_wxAcceleratorTable, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxAcceleratorTable", (PyCFunction) _wrap_delete_wxAcceleratorTable, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxAcceleratorTable_Ok", (PyCFunction) _wrap_wxAcceleratorTable_Ok, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxAcceleratorTable_swigregister", wxAcceleratorTable_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxGetAccelFromString", (PyCFunction) _wrap_wxGetAccelFromString, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"new_wxVisualAttributes", (PyCFunction) _wrap_new_wxVisualAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"delete_wxVisualAttributes", (PyCFunction) _wrap_delete_wxVisualAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxVisualAttributes_font_set", (PyCFunction) _wrap_wxVisualAttributes_font_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxVisualAttributes_font_get", (PyCFunction) _wrap_wxVisualAttributes_font_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxVisualAttributes_colFg_set", (PyCFunction) _wrap_wxVisualAttributes_colFg_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxVisualAttributes_colFg_get", (PyCFunction) _wrap_wxVisualAttributes_colFg_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxVisualAttributes_colBg_set", (PyCFunction) _wrap_wxVisualAttributes_colBg_set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxVisualAttributes_colBg_get", (PyCFunction) _wrap_wxVisualAttributes_colBg_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxVisualAttributes_swigregister", wxVisualAttributes_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxWindow", (PyCFunction) _wrap_new_wxWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SetDefaultPyEncoding", (PyCFunction) _wrap_SetDefaultPyEncoding, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GetDefaultPyEncoding", (PyCFunction) _wrap_GetDefaultPyEncoding, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"new_EventLoop", (PyCFunction) _wrap_new_EventLoop, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_EventLoop", (PyCFunction) _wrap_delete_EventLoop, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EventLoop_Run", (PyCFunction) _wrap_EventLoop_Run, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EventLoop_Exit", (PyCFunction) _wrap_EventLoop_Exit, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EventLoop_Pending", (PyCFunction) _wrap_EventLoop_Pending, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EventLoop_Dispatch", (PyCFunction) _wrap_EventLoop_Dispatch, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EventLoop_IsRunning", (PyCFunction) _wrap_EventLoop_IsRunning, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EventLoop_GetActive", (PyCFunction) _wrap_EventLoop_GetActive, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EventLoop_SetActive", (PyCFunction) _wrap_EventLoop_SetActive, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"EventLoop_swigregister", EventLoop_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_AcceleratorEntry", (PyCFunction) _wrap_new_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_AcceleratorEntry", (PyCFunction) _wrap_delete_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AcceleratorEntry_Set", (PyCFunction) _wrap_AcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AcceleratorEntry_GetFlags", (PyCFunction) _wrap_AcceleratorEntry_GetFlags, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AcceleratorEntry_GetKeyCode", (PyCFunction) _wrap_AcceleratorEntry_GetKeyCode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AcceleratorEntry_GetCommand", (PyCFunction) _wrap_AcceleratorEntry_GetCommand, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AcceleratorEntry_swigregister", AcceleratorEntry_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_AcceleratorTable", (PyCFunction) _wrap_new_AcceleratorTable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_AcceleratorTable", (PyCFunction) _wrap_delete_AcceleratorTable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AcceleratorTable_Ok", (PyCFunction) _wrap_AcceleratorTable_Ok, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AcceleratorTable_swigregister", AcceleratorTable_swigregister, METH_VARARGS, NULL},
+        { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"new_VisualAttributes", (PyCFunction) _wrap_new_VisualAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_VisualAttributes", (PyCFunction) _wrap_delete_VisualAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"VisualAttributes_font_set", (PyCFunction) _wrap_VisualAttributes_font_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"VisualAttributes_font_get", (PyCFunction) _wrap_VisualAttributes_font_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"VisualAttributes_colFg_set", (PyCFunction) _wrap_VisualAttributes_colFg_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"VisualAttributes_colFg_get", (PyCFunction) _wrap_VisualAttributes_colFg_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"VisualAttributes_colBg_set", (PyCFunction) _wrap_VisualAttributes_colBg_set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"VisualAttributes_colBg_get", (PyCFunction) _wrap_VisualAttributes_colBg_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"VisualAttributes_swigregister", VisualAttributes_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreWindow", (PyCFunction) _wrap_new_PreWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Create", (PyCFunction) _wrap_wxWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Close", (PyCFunction) _wrap_wxWindow_Close, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Destroy", (PyCFunction) _wrap_wxWindow_Destroy, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_DestroyChildren", (PyCFunction) _wrap_wxWindow_DestroyChildren, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_IsBeingDeleted", (PyCFunction) _wrap_wxWindow_IsBeingDeleted, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetTitle", (PyCFunction) _wrap_wxWindow_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetTitle", (PyCFunction) _wrap_wxWindow_GetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetLabel", (PyCFunction) _wrap_wxWindow_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetLabel", (PyCFunction) _wrap_wxWindow_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetName", (PyCFunction) _wrap_wxWindow_SetName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetName", (PyCFunction) _wrap_wxWindow_GetName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetWindowVariant", (PyCFunction) _wrap_wxWindow_SetWindowVariant, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetWindowVariant", (PyCFunction) _wrap_wxWindow_GetWindowVariant, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetId", (PyCFunction) _wrap_wxWindow_SetId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetId", (PyCFunction) _wrap_wxWindow_GetId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_NewControlId", (PyCFunction) _wrap_wxWindow_NewControlId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_NextControlId", (PyCFunction) _wrap_wxWindow_NextControlId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_PrevControlId", (PyCFunction) _wrap_wxWindow_PrevControlId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetSize", (PyCFunction) _wrap_wxWindow_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetDimensions", (PyCFunction) _wrap_wxWindow_SetDimensions, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetRect", (PyCFunction) _wrap_wxWindow_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetSizeWH", (PyCFunction) _wrap_wxWindow_SetSizeWH, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Move", (PyCFunction) _wrap_wxWindow_Move, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_MoveXY", (PyCFunction) _wrap_wxWindow_MoveXY, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetBestFittingSize", (PyCFunction) _wrap_wxWindow_SetBestFittingSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Raise", (PyCFunction) _wrap_wxWindow_Raise, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Lower", (PyCFunction) _wrap_wxWindow_Lower, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetClientSize", (PyCFunction) _wrap_wxWindow_SetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetClientSizeWH", (PyCFunction) _wrap_wxWindow_SetClientSizeWH, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetClientRect", (PyCFunction) _wrap_wxWindow_SetClientRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetPosition", (PyCFunction) _wrap_wxWindow_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetPositionTuple", (PyCFunction) _wrap_wxWindow_GetPositionTuple, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetSize", (PyCFunction) _wrap_wxWindow_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetSizeTuple", (PyCFunction) _wrap_wxWindow_GetSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetRect", (PyCFunction) _wrap_wxWindow_GetRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetClientSize", (PyCFunction) _wrap_wxWindow_GetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetClientSizeTuple", (PyCFunction) _wrap_wxWindow_GetClientSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetClientAreaOrigin", (PyCFunction) _wrap_wxWindow_GetClientAreaOrigin, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetClientRect", (PyCFunction) _wrap_wxWindow_GetClientRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetBestSize", (PyCFunction) _wrap_wxWindow_GetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetBestSizeTuple", (PyCFunction) _wrap_wxWindow_GetBestSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_InvalidateBestSize", (PyCFunction) _wrap_wxWindow_InvalidateBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetBestFittingSize", (PyCFunction) _wrap_wxWindow_GetBestFittingSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetAdjustedBestSize", (PyCFunction) _wrap_wxWindow_GetAdjustedBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Center", (PyCFunction) _wrap_wxWindow_Center, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_CenterOnScreen", (PyCFunction) _wrap_wxWindow_CenterOnScreen, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_CenterOnParent", (PyCFunction) _wrap_wxWindow_CenterOnParent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Fit", (PyCFunction) _wrap_wxWindow_Fit, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_FitInside", (PyCFunction) _wrap_wxWindow_FitInside, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetSizeHints", (PyCFunction) _wrap_wxWindow_SetSizeHints, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetSizeHintsSz", (PyCFunction) _wrap_wxWindow_SetSizeHintsSz, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetVirtualSizeHints", (PyCFunction) _wrap_wxWindow_SetVirtualSizeHints, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetVirtualSizeHintsSz", (PyCFunction) _wrap_wxWindow_SetVirtualSizeHintsSz, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetMaxSize", (PyCFunction) _wrap_wxWindow_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetMinSize", (PyCFunction) _wrap_wxWindow_GetMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetMinSize", (PyCFunction) _wrap_wxWindow_SetMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetMaxSize", (PyCFunction) _wrap_wxWindow_SetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetMinWidth", (PyCFunction) _wrap_wxWindow_GetMinWidth, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetMinHeight", (PyCFunction) _wrap_wxWindow_GetMinHeight, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetMaxWidth", (PyCFunction) _wrap_wxWindow_GetMaxWidth, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetMaxHeight", (PyCFunction) _wrap_wxWindow_GetMaxHeight, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetVirtualSize", (PyCFunction) _wrap_wxWindow_SetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetVirtualSizeWH", (PyCFunction) _wrap_wxWindow_SetVirtualSizeWH, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetVirtualSize", (PyCFunction) _wrap_wxWindow_GetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetVirtualSizeTuple", (PyCFunction) _wrap_wxWindow_GetVirtualSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetBestVirtualSize", (PyCFunction) _wrap_wxWindow_GetBestVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Show", (PyCFunction) _wrap_wxWindow_Show, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Hide", (PyCFunction) _wrap_wxWindow_Hide, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Enable", (PyCFunction) _wrap_wxWindow_Enable, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Disable", (PyCFunction) _wrap_wxWindow_Disable, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_IsShown", (PyCFunction) _wrap_wxWindow_IsShown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_IsEnabled", (PyCFunction) _wrap_wxWindow_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetWindowStyleFlag", (PyCFunction) _wrap_wxWindow_SetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetWindowStyleFlag", (PyCFunction) _wrap_wxWindow_GetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_HasFlag", (PyCFunction) _wrap_wxWindow_HasFlag, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_IsRetained", (PyCFunction) _wrap_wxWindow_IsRetained, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetExtraStyle", (PyCFunction) _wrap_wxWindow_SetExtraStyle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetExtraStyle", (PyCFunction) _wrap_wxWindow_GetExtraStyle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_MakeModal", (PyCFunction) _wrap_wxWindow_MakeModal, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetThemeEnabled", (PyCFunction) _wrap_wxWindow_SetThemeEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetThemeEnabled", (PyCFunction) _wrap_wxWindow_GetThemeEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetFocus", (PyCFunction) _wrap_wxWindow_SetFocus, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetFocusFromKbd", (PyCFunction) _wrap_wxWindow_SetFocusFromKbd, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_FindFocus", (PyCFunction) _wrap_wxWindow_FindFocus, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_AcceptsFocus", (PyCFunction) _wrap_wxWindow_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_wxWindow_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetDefaultItem", (PyCFunction) _wrap_wxWindow_GetDefaultItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetDefaultItem", (PyCFunction) _wrap_wxWindow_SetDefaultItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetTmpDefaultItem", (PyCFunction) _wrap_wxWindow_SetTmpDefaultItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Navigate", (PyCFunction) _wrap_wxWindow_Navigate, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_MoveAfterInTabOrder", (PyCFunction) _wrap_wxWindow_MoveAfterInTabOrder, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_MoveBeforeInTabOrder", (PyCFunction) _wrap_wxWindow_MoveBeforeInTabOrder, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetChildren", (PyCFunction) _wrap_wxWindow_GetChildren, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetParent", (PyCFunction) _wrap_wxWindow_GetParent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetGrandParent", (PyCFunction) _wrap_wxWindow_GetGrandParent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_IsTopLevel", (PyCFunction) _wrap_wxWindow_IsTopLevel, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Reparent", (PyCFunction) _wrap_wxWindow_Reparent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_AddChild", (PyCFunction) _wrap_wxWindow_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_RemoveChild", (PyCFunction) _wrap_wxWindow_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_FindWindowById", (PyCFunction) _wrap_wxWindow_FindWindowById, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_FindWindowByName", (PyCFunction) _wrap_wxWindow_FindWindowByName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetEventHandler", (PyCFunction) _wrap_wxWindow_GetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetEventHandler", (PyCFunction) _wrap_wxWindow_SetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_PushEventHandler", (PyCFunction) _wrap_wxWindow_PushEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_PopEventHandler", (PyCFunction) _wrap_wxWindow_PopEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_RemoveEventHandler", (PyCFunction) _wrap_wxWindow_RemoveEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetValidator", (PyCFunction) _wrap_wxWindow_SetValidator, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetValidator", (PyCFunction) _wrap_wxWindow_GetValidator, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Validate", (PyCFunction) _wrap_wxWindow_Validate, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_TransferDataToWindow", (PyCFunction) _wrap_wxWindow_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_TransferDataFromWindow", (PyCFunction) _wrap_wxWindow_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_InitDialog", (PyCFunction) _wrap_wxWindow_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetAcceleratorTable", (PyCFunction) _wrap_wxWindow_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetAcceleratorTable", (PyCFunction) _wrap_wxWindow_GetAcceleratorTable, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_RegisterHotKey", (PyCFunction) _wrap_wxWindow_RegisterHotKey, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_UnregisterHotKey", (PyCFunction) _wrap_wxWindow_UnregisterHotKey, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ConvertDialogPointToPixels", (PyCFunction) _wrap_wxWindow_ConvertDialogPointToPixels, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ConvertDialogSizeToPixels", (PyCFunction) _wrap_wxWindow_ConvertDialogSizeToPixels, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_DLG_PNT", (PyCFunction) _wrap_wxWindow_DLG_PNT, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_DLG_SZE", (PyCFunction) _wrap_wxWindow_DLG_SZE, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ConvertPixelPointToDialog", (PyCFunction) _wrap_wxWindow_ConvertPixelPointToDialog, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ConvertPixelSizeToDialog", (PyCFunction) _wrap_wxWindow_ConvertPixelSizeToDialog, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_WarpPointer", (PyCFunction) _wrap_wxWindow_WarpPointer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_CaptureMouse", (PyCFunction) _wrap_wxWindow_CaptureMouse, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ReleaseMouse", (PyCFunction) _wrap_wxWindow_ReleaseMouse, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetCapture", (PyCFunction) _wrap_wxWindow_GetCapture, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_HasCapture", (PyCFunction) _wrap_wxWindow_HasCapture, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Refresh", (PyCFunction) _wrap_wxWindow_Refresh, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_RefreshRect", (PyCFunction) _wrap_wxWindow_RefreshRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Update", (PyCFunction) _wrap_wxWindow_Update, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ClearBackground", (PyCFunction) _wrap_wxWindow_ClearBackground, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Freeze", (PyCFunction) _wrap_wxWindow_Freeze, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Thaw", (PyCFunction) _wrap_wxWindow_Thaw, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_PrepareDC", (PyCFunction) _wrap_wxWindow_PrepareDC, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetUpdateRegion", (PyCFunction) _wrap_wxWindow_GetUpdateRegion, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetUpdateClientRect", (PyCFunction) _wrap_wxWindow_GetUpdateClientRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_IsExposed", (PyCFunction) _wrap_wxWindow_IsExposed, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_IsExposedPoint", (PyCFunction) _wrap_wxWindow_IsExposedPoint, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_IsExposedRect", (PyCFunction) _wrap_wxWindow_IsExposedRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetDefaultAttributes", (PyCFunction) _wrap_wxWindow_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_wxWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetBackgroundColour", (PyCFunction) _wrap_wxWindow_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetOwnBackgroundColour", (PyCFunction) _wrap_wxWindow_SetOwnBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetForegroundColour", (PyCFunction) _wrap_wxWindow_SetForegroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetOwnForegroundColour", (PyCFunction) _wrap_wxWindow_SetOwnForegroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetBackgroundColour", (PyCFunction) _wrap_wxWindow_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetForegroundColour", (PyCFunction) _wrap_wxWindow_GetForegroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_InheritsBackgroundColour", (PyCFunction) _wrap_wxWindow_InheritsBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_UseBgCol", (PyCFunction) _wrap_wxWindow_UseBgCol, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetBackgroundStyle", (PyCFunction) _wrap_wxWindow_SetBackgroundStyle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetBackgroundStyle", (PyCFunction) _wrap_wxWindow_GetBackgroundStyle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_HasTransparentBackground", (PyCFunction) _wrap_wxWindow_HasTransparentBackground, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetCursor", (PyCFunction) _wrap_wxWindow_SetCursor, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetCursor", (PyCFunction) _wrap_wxWindow_GetCursor, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetFont", (PyCFunction) _wrap_wxWindow_SetFont, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetOwnFont", (PyCFunction) _wrap_wxWindow_SetOwnFont, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetFont", (PyCFunction) _wrap_wxWindow_GetFont, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetCaret", (PyCFunction) _wrap_wxWindow_SetCaret, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetCaret", (PyCFunction) _wrap_wxWindow_GetCaret, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetCharHeight", (PyCFunction) _wrap_wxWindow_GetCharHeight, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetCharWidth", (PyCFunction) _wrap_wxWindow_GetCharWidth, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetTextExtent", (PyCFunction) _wrap_wxWindow_GetTextExtent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetFullTextExtent", (PyCFunction) _wrap_wxWindow_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ClientToScreenXY", (PyCFunction) _wrap_wxWindow_ClientToScreenXY, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ScreenToClientXY", (PyCFunction) _wrap_wxWindow_ScreenToClientXY, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ClientToScreen", (PyCFunction) _wrap_wxWindow_ClientToScreen, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ScreenToClient", (PyCFunction) _wrap_wxWindow_ScreenToClient, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_HitTestXY", (PyCFunction) _wrap_wxWindow_HitTestXY, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_HitTest", (PyCFunction) _wrap_wxWindow_HitTest, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetBorder", _wrap_wxWindow_GetBorder, METH_VARARGS, NULL},
-        { (char *)"wxWindow_UpdateWindowUI", (PyCFunction) _wrap_wxWindow_UpdateWindowUI, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_PopupMenuXY", (PyCFunction) _wrap_wxWindow_PopupMenuXY, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_PopupMenu", (PyCFunction) _wrap_wxWindow_PopupMenu, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetHandle", (PyCFunction) _wrap_wxWindow_GetHandle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_AssociateHandle", (PyCFunction) _wrap_wxWindow_AssociateHandle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_DissociateHandle", (PyCFunction) _wrap_wxWindow_DissociateHandle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_HasScrollbar", (PyCFunction) _wrap_wxWindow_HasScrollbar, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetScrollbar", (PyCFunction) _wrap_wxWindow_SetScrollbar, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetScrollPos", (PyCFunction) _wrap_wxWindow_SetScrollPos, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetScrollPos", (PyCFunction) _wrap_wxWindow_GetScrollPos, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetScrollThumb", (PyCFunction) _wrap_wxWindow_GetScrollThumb, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetScrollRange", (PyCFunction) _wrap_wxWindow_GetScrollRange, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ScrollWindow", (PyCFunction) _wrap_wxWindow_ScrollWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ScrollLines", (PyCFunction) _wrap_wxWindow_ScrollLines, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ScrollPages", (PyCFunction) _wrap_wxWindow_ScrollPages, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_LineUp", (PyCFunction) _wrap_wxWindow_LineUp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_LineDown", (PyCFunction) _wrap_wxWindow_LineDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_PageUp", (PyCFunction) _wrap_wxWindow_PageUp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_PageDown", (PyCFunction) _wrap_wxWindow_PageDown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetHelpText", (PyCFunction) _wrap_wxWindow_SetHelpText, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetHelpTextForId", (PyCFunction) _wrap_wxWindow_SetHelpTextForId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetHelpText", (PyCFunction) _wrap_wxWindow_GetHelpText, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetToolTipString", (PyCFunction) _wrap_wxWindow_SetToolTipString, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetToolTip", (PyCFunction) _wrap_wxWindow_SetToolTip, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetToolTip", (PyCFunction) _wrap_wxWindow_GetToolTip, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetDropTarget", (PyCFunction) _wrap_wxWindow_SetDropTarget, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetDropTarget", (PyCFunction) _wrap_wxWindow_GetDropTarget, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetConstraints", (PyCFunction) _wrap_wxWindow_SetConstraints, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetConstraints", (PyCFunction) _wrap_wxWindow_GetConstraints, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetAutoLayout", (PyCFunction) _wrap_wxWindow_SetAutoLayout, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetAutoLayout", (PyCFunction) _wrap_wxWindow_GetAutoLayout, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_Layout", (PyCFunction) _wrap_wxWindow_Layout, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetSizer", (PyCFunction) _wrap_wxWindow_SetSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetSizerAndFit", (PyCFunction) _wrap_wxWindow_SetSizerAndFit, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetSizer", (PyCFunction) _wrap_wxWindow_GetSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_SetContainingSizer", (PyCFunction) _wrap_wxWindow_SetContainingSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_GetContainingSizer", (PyCFunction) _wrap_wxWindow_GetContainingSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_InheritAttributes", (PyCFunction) _wrap_wxWindow_InheritAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_ShouldInheritColours", (PyCFunction) _wrap_wxWindow_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_swigregister", wxWindow_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxFindWindowById", (PyCFunction) _wrap_wxFindWindowById, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFindWindowByName", (PyCFunction) _wrap_wxFindWindowByName, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFindWindowByLabel", (PyCFunction) _wrap_wxFindWindowByLabel, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxWindow_FromHWND", (PyCFunction) _wrap_wxWindow_FromHWND, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"new_wxValidator", (PyCFunction) _wrap_new_wxValidator, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxValidator_Clone", (PyCFunction) _wrap_wxValidator_Clone, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxValidator_Validate", (PyCFunction) _wrap_wxValidator_Validate, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxValidator_TransferToWindow", (PyCFunction) _wrap_wxValidator_TransferToWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxValidator_TransferFromWindow", (PyCFunction) _wrap_wxValidator_TransferFromWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxValidator_GetWindow", (PyCFunction) _wrap_wxValidator_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxValidator_SetWindow", (PyCFunction) _wrap_wxValidator_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxValidator_IsSilent", (PyCFunction) _wrap_wxValidator_IsSilent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxValidator_SetBellOnError", (PyCFunction) _wrap_wxValidator_SetBellOnError, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxValidator_swigregister", wxValidator_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxPyValidator", (PyCFunction) _wrap_new_wxPyValidator, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyValidator__setCallbackInfo", (PyCFunction) _wrap_wxPyValidator__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPyValidator_swigregister", wxPyValidator_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxMenu", (PyCFunction) _wrap_new_wxMenu, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_Append", (PyCFunction) _wrap_wxMenu_Append, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_AppendSeparator", (PyCFunction) _wrap_wxMenu_AppendSeparator, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_AppendCheckItem", (PyCFunction) _wrap_wxMenu_AppendCheckItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_AppendRadioItem", (PyCFunction) _wrap_wxMenu_AppendRadioItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_AppendMenu", (PyCFunction) _wrap_wxMenu_AppendMenu, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_AppendItem", (PyCFunction) _wrap_wxMenu_AppendItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_Break", (PyCFunction) _wrap_wxMenu_Break, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_InsertItem", (PyCFunction) _wrap_wxMenu_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_Insert", (PyCFunction) _wrap_wxMenu_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_InsertSeparator", (PyCFunction) _wrap_wxMenu_InsertSeparator, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_InsertCheckItem", (PyCFunction) _wrap_wxMenu_InsertCheckItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_InsertRadioItem", (PyCFunction) _wrap_wxMenu_InsertRadioItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_InsertMenu", (PyCFunction) _wrap_wxMenu_InsertMenu, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_PrependItem", (PyCFunction) _wrap_wxMenu_PrependItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_Prepend", (PyCFunction) _wrap_wxMenu_Prepend, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_PrependSeparator", (PyCFunction) _wrap_wxMenu_PrependSeparator, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_PrependCheckItem", (PyCFunction) _wrap_wxMenu_PrependCheckItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_PrependRadioItem", (PyCFunction) _wrap_wxMenu_PrependRadioItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_PrependMenu", (PyCFunction) _wrap_wxMenu_PrependMenu, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_Remove", (PyCFunction) _wrap_wxMenu_Remove, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_RemoveItem", (PyCFunction) _wrap_wxMenu_RemoveItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_Delete", (PyCFunction) _wrap_wxMenu_Delete, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_DeleteItem", (PyCFunction) _wrap_wxMenu_DeleteItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_Destroy", (PyCFunction) _wrap_wxMenu_Destroy, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_DestroyId", (PyCFunction) _wrap_wxMenu_DestroyId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_DestroyItem", (PyCFunction) _wrap_wxMenu_DestroyItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_GetMenuItemCount", (PyCFunction) _wrap_wxMenu_GetMenuItemCount, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_GetMenuItems", (PyCFunction) _wrap_wxMenu_GetMenuItems, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_FindItem", (PyCFunction) _wrap_wxMenu_FindItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_FindItemById", (PyCFunction) _wrap_wxMenu_FindItemById, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_FindItemByPosition", (PyCFunction) _wrap_wxMenu_FindItemByPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_Enable", (PyCFunction) _wrap_wxMenu_Enable, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_IsEnabled", (PyCFunction) _wrap_wxMenu_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_Check", (PyCFunction) _wrap_wxMenu_Check, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_IsChecked", (PyCFunction) _wrap_wxMenu_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_SetLabel", (PyCFunction) _wrap_wxMenu_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_GetLabel", (PyCFunction) _wrap_wxMenu_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_SetHelpString", (PyCFunction) _wrap_wxMenu_SetHelpString, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_GetHelpString", (PyCFunction) _wrap_wxMenu_GetHelpString, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_SetTitle", (PyCFunction) _wrap_wxMenu_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_GetTitle", (PyCFunction) _wrap_wxMenu_GetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_SetEventHandler", (PyCFunction) _wrap_wxMenu_SetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_GetEventHandler", (PyCFunction) _wrap_wxMenu_GetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_SetInvokingWindow", (PyCFunction) _wrap_wxMenu_SetInvokingWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_GetInvokingWindow", (PyCFunction) _wrap_wxMenu_GetInvokingWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_GetStyle", (PyCFunction) _wrap_wxMenu_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_UpdateUI", (PyCFunction) _wrap_wxMenu_UpdateUI, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_GetMenuBar", (PyCFunction) _wrap_wxMenu_GetMenuBar, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_Attach", (PyCFunction) _wrap_wxMenu_Attach, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_Detach", (PyCFunction) _wrap_wxMenu_Detach, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_IsAttached", (PyCFunction) _wrap_wxMenu_IsAttached, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_SetParent", (PyCFunction) _wrap_wxMenu_SetParent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_GetParent", (PyCFunction) _wrap_wxMenu_GetParent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenu_swigregister", wxMenu_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxMenuBar", (PyCFunction) _wrap_new_wxMenuBar, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_Append", (PyCFunction) _wrap_wxMenuBar_Append, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_Insert", (PyCFunction) _wrap_wxMenuBar_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_GetMenuCount", (PyCFunction) _wrap_wxMenuBar_GetMenuCount, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_GetMenu", (PyCFunction) _wrap_wxMenuBar_GetMenu, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_Replace", (PyCFunction) _wrap_wxMenuBar_Replace, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_Remove", (PyCFunction) _wrap_wxMenuBar_Remove, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_EnableTop", (PyCFunction) _wrap_wxMenuBar_EnableTop, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_IsEnabledTop", (PyCFunction) _wrap_wxMenuBar_IsEnabledTop, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_SetLabelTop", (PyCFunction) _wrap_wxMenuBar_SetLabelTop, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_GetLabelTop", (PyCFunction) _wrap_wxMenuBar_GetLabelTop, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_FindMenuItem", (PyCFunction) _wrap_wxMenuBar_FindMenuItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_FindItemById", (PyCFunction) _wrap_wxMenuBar_FindItemById, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_FindMenu", (PyCFunction) _wrap_wxMenuBar_FindMenu, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_Enable", (PyCFunction) _wrap_wxMenuBar_Enable, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_Check", (PyCFunction) _wrap_wxMenuBar_Check, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_IsChecked", (PyCFunction) _wrap_wxMenuBar_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_IsEnabled", (PyCFunction) _wrap_wxMenuBar_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_SetLabel", (PyCFunction) _wrap_wxMenuBar_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_GetLabel", (PyCFunction) _wrap_wxMenuBar_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_SetHelpString", (PyCFunction) _wrap_wxMenuBar_SetHelpString, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_GetHelpString", (PyCFunction) _wrap_wxMenuBar_GetHelpString, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_GetFrame", (PyCFunction) _wrap_wxMenuBar_GetFrame, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_IsAttached", (PyCFunction) _wrap_wxMenuBar_IsAttached, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_Attach", (PyCFunction) _wrap_wxMenuBar_Attach, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_Detach", (PyCFunction) _wrap_wxMenuBar_Detach, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuBar_swigregister", wxMenuBar_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxMenuItem", (PyCFunction) _wrap_new_wxMenuItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetMenu", (PyCFunction) _wrap_wxMenuItem_GetMenu, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetMenu", (PyCFunction) _wrap_wxMenuItem_SetMenu, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetId", (PyCFunction) _wrap_wxMenuItem_SetId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetId", (PyCFunction) _wrap_wxMenuItem_GetId, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_IsSeparator", (PyCFunction) _wrap_wxMenuItem_IsSeparator, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetText", (PyCFunction) _wrap_wxMenuItem_SetText, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetLabel", (PyCFunction) _wrap_wxMenuItem_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetText", (PyCFunction) _wrap_wxMenuItem_GetText, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetLabelFromText", (PyCFunction) _wrap_wxMenuItem_GetLabelFromText, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetKind", (PyCFunction) _wrap_wxMenuItem_GetKind, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetKind", (PyCFunction) _wrap_wxMenuItem_SetKind, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetCheckable", (PyCFunction) _wrap_wxMenuItem_SetCheckable, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_IsCheckable", (PyCFunction) _wrap_wxMenuItem_IsCheckable, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_IsSubMenu", (PyCFunction) _wrap_wxMenuItem_IsSubMenu, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetSubMenu", (PyCFunction) _wrap_wxMenuItem_SetSubMenu, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetSubMenu", (PyCFunction) _wrap_wxMenuItem_GetSubMenu, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_Enable", (PyCFunction) _wrap_wxMenuItem_Enable, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_IsEnabled", (PyCFunction) _wrap_wxMenuItem_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_Check", (PyCFunction) _wrap_wxMenuItem_Check, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_IsChecked", (PyCFunction) _wrap_wxMenuItem_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_Toggle", (PyCFunction) _wrap_wxMenuItem_Toggle, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetHelp", (PyCFunction) _wrap_wxMenuItem_SetHelp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetHelp", (PyCFunction) _wrap_wxMenuItem_GetHelp, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetAccel", (PyCFunction) _wrap_wxMenuItem_GetAccel, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetAccel", (PyCFunction) _wrap_wxMenuItem_SetAccel, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetFont", (PyCFunction) _wrap_wxMenuItem_SetFont, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetFont", (PyCFunction) _wrap_wxMenuItem_GetFont, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetTextColour", (PyCFunction) _wrap_wxMenuItem_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetTextColour", (PyCFunction) _wrap_wxMenuItem_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetBackgroundColour", (PyCFunction) _wrap_wxMenuItem_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetBackgroundColour", (PyCFunction) _wrap_wxMenuItem_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetBitmaps", (PyCFunction) _wrap_wxMenuItem_SetBitmaps, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetDisabledBitmap", (PyCFunction) _wrap_wxMenuItem_SetDisabledBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetDisabledBitmap", (PyCFunction) _wrap_wxMenuItem_GetDisabledBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetMarginWidth", (PyCFunction) _wrap_wxMenuItem_SetMarginWidth, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetMarginWidth", (PyCFunction) _wrap_wxMenuItem_GetMarginWidth, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetDefaultMarginWidth", (PyCFunction) _wrap_wxMenuItem_GetDefaultMarginWidth, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_IsOwnerDrawn", (PyCFunction) _wrap_wxMenuItem_IsOwnerDrawn, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetOwnerDrawn", (PyCFunction) _wrap_wxMenuItem_SetOwnerDrawn, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_ResetOwnerDrawn", (PyCFunction) _wrap_wxMenuItem_ResetOwnerDrawn, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_SetBitmap", (PyCFunction) _wrap_wxMenuItem_SetBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_GetBitmap", (PyCFunction) _wrap_wxMenuItem_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxMenuItem_swigregister", wxMenuItem_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxControl", (PyCFunction) _wrap_new_wxControl, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Create", (PyCFunction) _wrap_Window_Create, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Close", (PyCFunction) _wrap_Window_Close, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Destroy", (PyCFunction) _wrap_Window_Destroy, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_DestroyChildren", (PyCFunction) _wrap_Window_DestroyChildren, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_IsBeingDeleted", (PyCFunction) _wrap_Window_IsBeingDeleted, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetTitle", (PyCFunction) _wrap_Window_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetTitle", (PyCFunction) _wrap_Window_GetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetLabel", (PyCFunction) _wrap_Window_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetLabel", (PyCFunction) _wrap_Window_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetName", (PyCFunction) _wrap_Window_SetName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetName", (PyCFunction) _wrap_Window_GetName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetWindowVariant", (PyCFunction) _wrap_Window_SetWindowVariant, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetWindowVariant", (PyCFunction) _wrap_Window_GetWindowVariant, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetId", (PyCFunction) _wrap_Window_SetId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetId", (PyCFunction) _wrap_Window_GetId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_NewControlId", (PyCFunction) _wrap_Window_NewControlId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_NextControlId", (PyCFunction) _wrap_Window_NextControlId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_PrevControlId", (PyCFunction) _wrap_Window_PrevControlId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetSize", (PyCFunction) _wrap_Window_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetDimensions", (PyCFunction) _wrap_Window_SetDimensions, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetRect", (PyCFunction) _wrap_Window_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetSizeWH", (PyCFunction) _wrap_Window_SetSizeWH, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Move", (PyCFunction) _wrap_Window_Move, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_MoveXY", (PyCFunction) _wrap_Window_MoveXY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetBestFittingSize", (PyCFunction) _wrap_Window_SetBestFittingSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Raise", (PyCFunction) _wrap_Window_Raise, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Lower", (PyCFunction) _wrap_Window_Lower, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetClientSize", (PyCFunction) _wrap_Window_SetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetClientSizeWH", (PyCFunction) _wrap_Window_SetClientSizeWH, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetClientRect", (PyCFunction) _wrap_Window_SetClientRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetPosition", (PyCFunction) _wrap_Window_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetPositionTuple", (PyCFunction) _wrap_Window_GetPositionTuple, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetSize", (PyCFunction) _wrap_Window_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetSizeTuple", (PyCFunction) _wrap_Window_GetSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetRect", (PyCFunction) _wrap_Window_GetRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetClientSize", (PyCFunction) _wrap_Window_GetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetClientSizeTuple", (PyCFunction) _wrap_Window_GetClientSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetClientAreaOrigin", (PyCFunction) _wrap_Window_GetClientAreaOrigin, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetClientRect", (PyCFunction) _wrap_Window_GetClientRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetBestSize", (PyCFunction) _wrap_Window_GetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetBestSizeTuple", (PyCFunction) _wrap_Window_GetBestSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_InvalidateBestSize", (PyCFunction) _wrap_Window_InvalidateBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_CacheBestSize", (PyCFunction) _wrap_Window_CacheBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetBestFittingSize", (PyCFunction) _wrap_Window_GetBestFittingSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetAdjustedBestSize", (PyCFunction) _wrap_Window_GetAdjustedBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_CenterOnScreen", (PyCFunction) _wrap_Window_CenterOnScreen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Fit", (PyCFunction) _wrap_Window_Fit, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_FitInside", (PyCFunction) _wrap_Window_FitInside, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetSizeHints", (PyCFunction) _wrap_Window_SetSizeHints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetSizeHintsSz", (PyCFunction) _wrap_Window_SetSizeHintsSz, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetVirtualSizeHints", (PyCFunction) _wrap_Window_SetVirtualSizeHints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetVirtualSizeHintsSz", (PyCFunction) _wrap_Window_SetVirtualSizeHintsSz, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetMaxSize", (PyCFunction) _wrap_Window_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetMinSize", (PyCFunction) _wrap_Window_GetMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetMinSize", (PyCFunction) _wrap_Window_SetMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetMaxSize", (PyCFunction) _wrap_Window_SetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetMinWidth", (PyCFunction) _wrap_Window_GetMinWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetMinHeight", (PyCFunction) _wrap_Window_GetMinHeight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetMaxWidth", (PyCFunction) _wrap_Window_GetMaxWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetMaxHeight", (PyCFunction) _wrap_Window_GetMaxHeight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetVirtualSize", (PyCFunction) _wrap_Window_SetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetVirtualSizeWH", (PyCFunction) _wrap_Window_SetVirtualSizeWH, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetVirtualSize", (PyCFunction) _wrap_Window_GetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetVirtualSizeTuple", (PyCFunction) _wrap_Window_GetVirtualSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetBestVirtualSize", (PyCFunction) _wrap_Window_GetBestVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Show", (PyCFunction) _wrap_Window_Show, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Hide", (PyCFunction) _wrap_Window_Hide, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Enable", (PyCFunction) _wrap_Window_Enable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Disable", (PyCFunction) _wrap_Window_Disable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_IsShown", (PyCFunction) _wrap_Window_IsShown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_IsEnabled", (PyCFunction) _wrap_Window_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetWindowStyleFlag", (PyCFunction) _wrap_Window_SetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetWindowStyleFlag", (PyCFunction) _wrap_Window_GetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_HasFlag", (PyCFunction) _wrap_Window_HasFlag, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_IsRetained", (PyCFunction) _wrap_Window_IsRetained, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetExtraStyle", (PyCFunction) _wrap_Window_SetExtraStyle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetExtraStyle", (PyCFunction) _wrap_Window_GetExtraStyle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_MakeModal", (PyCFunction) _wrap_Window_MakeModal, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetThemeEnabled", (PyCFunction) _wrap_Window_SetThemeEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetThemeEnabled", (PyCFunction) _wrap_Window_GetThemeEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetFocus", (PyCFunction) _wrap_Window_SetFocus, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetFocusFromKbd", (PyCFunction) _wrap_Window_SetFocusFromKbd, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_FindFocus", (PyCFunction) _wrap_Window_FindFocus, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_AcceptsFocus", (PyCFunction) _wrap_Window_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_Window_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetDefaultItem", (PyCFunction) _wrap_Window_GetDefaultItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetDefaultItem", (PyCFunction) _wrap_Window_SetDefaultItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetTmpDefaultItem", (PyCFunction) _wrap_Window_SetTmpDefaultItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Navigate", (PyCFunction) _wrap_Window_Navigate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_MoveAfterInTabOrder", (PyCFunction) _wrap_Window_MoveAfterInTabOrder, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_MoveBeforeInTabOrder", (PyCFunction) _wrap_Window_MoveBeforeInTabOrder, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetChildren", (PyCFunction) _wrap_Window_GetChildren, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetParent", (PyCFunction) _wrap_Window_GetParent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetGrandParent", (PyCFunction) _wrap_Window_GetGrandParent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_IsTopLevel", (PyCFunction) _wrap_Window_IsTopLevel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Reparent", (PyCFunction) _wrap_Window_Reparent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_AddChild", (PyCFunction) _wrap_Window_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_RemoveChild", (PyCFunction) _wrap_Window_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_FindWindowById", (PyCFunction) _wrap_Window_FindWindowById, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_FindWindowByName", (PyCFunction) _wrap_Window_FindWindowByName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetEventHandler", (PyCFunction) _wrap_Window_GetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetEventHandler", (PyCFunction) _wrap_Window_SetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_PushEventHandler", (PyCFunction) _wrap_Window_PushEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_PopEventHandler", (PyCFunction) _wrap_Window_PopEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_RemoveEventHandler", (PyCFunction) _wrap_Window_RemoveEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetValidator", (PyCFunction) _wrap_Window_SetValidator, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetValidator", (PyCFunction) _wrap_Window_GetValidator, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Validate", (PyCFunction) _wrap_Window_Validate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_TransferDataToWindow", (PyCFunction) _wrap_Window_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_TransferDataFromWindow", (PyCFunction) _wrap_Window_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_InitDialog", (PyCFunction) _wrap_Window_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetAcceleratorTable", (PyCFunction) _wrap_Window_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetAcceleratorTable", (PyCFunction) _wrap_Window_GetAcceleratorTable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_RegisterHotKey", (PyCFunction) _wrap_Window_RegisterHotKey, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_UnregisterHotKey", (PyCFunction) _wrap_Window_UnregisterHotKey, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ConvertDialogPointToPixels", (PyCFunction) _wrap_Window_ConvertDialogPointToPixels, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ConvertDialogSizeToPixels", (PyCFunction) _wrap_Window_ConvertDialogSizeToPixels, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_DLG_PNT", (PyCFunction) _wrap_Window_DLG_PNT, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_DLG_SZE", (PyCFunction) _wrap_Window_DLG_SZE, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ConvertPixelPointToDialog", (PyCFunction) _wrap_Window_ConvertPixelPointToDialog, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ConvertPixelSizeToDialog", (PyCFunction) _wrap_Window_ConvertPixelSizeToDialog, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_WarpPointer", (PyCFunction) _wrap_Window_WarpPointer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_CaptureMouse", (PyCFunction) _wrap_Window_CaptureMouse, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ReleaseMouse", (PyCFunction) _wrap_Window_ReleaseMouse, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetCapture", (PyCFunction) _wrap_Window_GetCapture, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_HasCapture", (PyCFunction) _wrap_Window_HasCapture, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Refresh", (PyCFunction) _wrap_Window_Refresh, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_RefreshRect", (PyCFunction) _wrap_Window_RefreshRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Update", (PyCFunction) _wrap_Window_Update, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ClearBackground", (PyCFunction) _wrap_Window_ClearBackground, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Freeze", (PyCFunction) _wrap_Window_Freeze, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Thaw", (PyCFunction) _wrap_Window_Thaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_PrepareDC", (PyCFunction) _wrap_Window_PrepareDC, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetUpdateRegion", (PyCFunction) _wrap_Window_GetUpdateRegion, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetUpdateClientRect", (PyCFunction) _wrap_Window_GetUpdateClientRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_IsExposed", (PyCFunction) _wrap_Window_IsExposed, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_IsExposedPoint", (PyCFunction) _wrap_Window_IsExposedPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_IsExposedRect", (PyCFunction) _wrap_Window_IsExposedRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetDefaultAttributes", (PyCFunction) _wrap_Window_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetClassDefaultAttributes", (PyCFunction) _wrap_Window_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetBackgroundColour", (PyCFunction) _wrap_Window_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetOwnBackgroundColour", (PyCFunction) _wrap_Window_SetOwnBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetForegroundColour", (PyCFunction) _wrap_Window_SetForegroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetOwnForegroundColour", (PyCFunction) _wrap_Window_SetOwnForegroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetBackgroundColour", (PyCFunction) _wrap_Window_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetForegroundColour", (PyCFunction) _wrap_Window_GetForegroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_InheritsBackgroundColour", (PyCFunction) _wrap_Window_InheritsBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_UseBgCol", (PyCFunction) _wrap_Window_UseBgCol, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetBackgroundStyle", (PyCFunction) _wrap_Window_SetBackgroundStyle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetBackgroundStyle", (PyCFunction) _wrap_Window_GetBackgroundStyle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_HasTransparentBackground", (PyCFunction) _wrap_Window_HasTransparentBackground, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetCursor", (PyCFunction) _wrap_Window_SetCursor, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetCursor", (PyCFunction) _wrap_Window_GetCursor, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetFont", (PyCFunction) _wrap_Window_SetFont, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetOwnFont", (PyCFunction) _wrap_Window_SetOwnFont, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetFont", (PyCFunction) _wrap_Window_GetFont, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetCaret", (PyCFunction) _wrap_Window_SetCaret, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetCaret", (PyCFunction) _wrap_Window_GetCaret, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetCharHeight", (PyCFunction) _wrap_Window_GetCharHeight, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetCharWidth", (PyCFunction) _wrap_Window_GetCharWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetTextExtent", (PyCFunction) _wrap_Window_GetTextExtent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetFullTextExtent", (PyCFunction) _wrap_Window_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ClientToScreenXY", (PyCFunction) _wrap_Window_ClientToScreenXY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ScreenToClientXY", (PyCFunction) _wrap_Window_ScreenToClientXY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ClientToScreen", (PyCFunction) _wrap_Window_ClientToScreen, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ScreenToClient", (PyCFunction) _wrap_Window_ScreenToClient, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_HitTestXY", (PyCFunction) _wrap_Window_HitTestXY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_HitTest", (PyCFunction) _wrap_Window_HitTest, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetBorder", _wrap_Window_GetBorder, METH_VARARGS, NULL},
+        { (char *)"Window_UpdateWindowUI", (PyCFunction) _wrap_Window_UpdateWindowUI, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_PopupMenuXY", (PyCFunction) _wrap_Window_PopupMenuXY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_PopupMenu", (PyCFunction) _wrap_Window_PopupMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetHandle", (PyCFunction) _wrap_Window_GetHandle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_AssociateHandle", (PyCFunction) _wrap_Window_AssociateHandle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_DissociateHandle", (PyCFunction) _wrap_Window_DissociateHandle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_HasScrollbar", (PyCFunction) _wrap_Window_HasScrollbar, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetScrollbar", (PyCFunction) _wrap_Window_SetScrollbar, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetScrollPos", (PyCFunction) _wrap_Window_SetScrollPos, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetScrollPos", (PyCFunction) _wrap_Window_GetScrollPos, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetScrollThumb", (PyCFunction) _wrap_Window_GetScrollThumb, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetScrollRange", (PyCFunction) _wrap_Window_GetScrollRange, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ScrollWindow", (PyCFunction) _wrap_Window_ScrollWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ScrollLines", (PyCFunction) _wrap_Window_ScrollLines, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ScrollPages", (PyCFunction) _wrap_Window_ScrollPages, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_LineUp", (PyCFunction) _wrap_Window_LineUp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_LineDown", (PyCFunction) _wrap_Window_LineDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_PageUp", (PyCFunction) _wrap_Window_PageUp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_PageDown", (PyCFunction) _wrap_Window_PageDown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetHelpText", (PyCFunction) _wrap_Window_SetHelpText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetHelpTextForId", (PyCFunction) _wrap_Window_SetHelpTextForId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetHelpText", (PyCFunction) _wrap_Window_GetHelpText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetToolTipString", (PyCFunction) _wrap_Window_SetToolTipString, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetToolTip", (PyCFunction) _wrap_Window_SetToolTip, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetToolTip", (PyCFunction) _wrap_Window_GetToolTip, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetDropTarget", (PyCFunction) _wrap_Window_SetDropTarget, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetDropTarget", (PyCFunction) _wrap_Window_GetDropTarget, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_DragAcceptFiles", (PyCFunction) _wrap_Window_DragAcceptFiles, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetConstraints", (PyCFunction) _wrap_Window_SetConstraints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetConstraints", (PyCFunction) _wrap_Window_GetConstraints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetAutoLayout", (PyCFunction) _wrap_Window_SetAutoLayout, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetAutoLayout", (PyCFunction) _wrap_Window_GetAutoLayout, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_Layout", (PyCFunction) _wrap_Window_Layout, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetSizer", (PyCFunction) _wrap_Window_SetSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetSizerAndFit", (PyCFunction) _wrap_Window_SetSizerAndFit, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetSizer", (PyCFunction) _wrap_Window_GetSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_SetContainingSizer", (PyCFunction) _wrap_Window_SetContainingSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_GetContainingSizer", (PyCFunction) _wrap_Window_GetContainingSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_InheritAttributes", (PyCFunction) _wrap_Window_InheritAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_ShouldInheritColours", (PyCFunction) _wrap_Window_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_swigregister", Window_swigregister, METH_VARARGS, NULL},
+        { (char *)"FindWindowById", (PyCFunction) _wrap_FindWindowById, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FindWindowByName", (PyCFunction) _wrap_FindWindowByName, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FindWindowByLabel", (PyCFunction) _wrap_FindWindowByLabel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Window_FromHWND", (PyCFunction) _wrap_Window_FromHWND, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GetTopLevelWindows", (PyCFunction) _wrap_GetTopLevelWindows, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"new_Validator", (PyCFunction) _wrap_new_Validator, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Validator_Clone", (PyCFunction) _wrap_Validator_Clone, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Validator_Validate", (PyCFunction) _wrap_Validator_Validate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Validator_TransferToWindow", (PyCFunction) _wrap_Validator_TransferToWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Validator_TransferFromWindow", (PyCFunction) _wrap_Validator_TransferFromWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Validator_GetWindow", (PyCFunction) _wrap_Validator_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Validator_SetWindow", (PyCFunction) _wrap_Validator_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Validator_IsSilent", (PyCFunction) _wrap_Validator_IsSilent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Validator_SetBellOnError", (PyCFunction) _wrap_Validator_SetBellOnError, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Validator_swigregister", Validator_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PyValidator", (PyCFunction) _wrap_new_PyValidator, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyValidator__setCallbackInfo", (PyCFunction) _wrap_PyValidator__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyValidator_swigregister", PyValidator_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_Menu", (PyCFunction) _wrap_new_Menu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_Append", (PyCFunction) _wrap_Menu_Append, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_AppendSeparator", (PyCFunction) _wrap_Menu_AppendSeparator, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_AppendCheckItem", (PyCFunction) _wrap_Menu_AppendCheckItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_AppendRadioItem", (PyCFunction) _wrap_Menu_AppendRadioItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_AppendMenu", (PyCFunction) _wrap_Menu_AppendMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_AppendItem", (PyCFunction) _wrap_Menu_AppendItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_Break", (PyCFunction) _wrap_Menu_Break, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_InsertItem", (PyCFunction) _wrap_Menu_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_Insert", (PyCFunction) _wrap_Menu_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_InsertSeparator", (PyCFunction) _wrap_Menu_InsertSeparator, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_InsertCheckItem", (PyCFunction) _wrap_Menu_InsertCheckItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_InsertRadioItem", (PyCFunction) _wrap_Menu_InsertRadioItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_InsertMenu", (PyCFunction) _wrap_Menu_InsertMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_PrependItem", (PyCFunction) _wrap_Menu_PrependItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_Prepend", (PyCFunction) _wrap_Menu_Prepend, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_PrependSeparator", (PyCFunction) _wrap_Menu_PrependSeparator, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_PrependCheckItem", (PyCFunction) _wrap_Menu_PrependCheckItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_PrependRadioItem", (PyCFunction) _wrap_Menu_PrependRadioItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_PrependMenu", (PyCFunction) _wrap_Menu_PrependMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_Remove", (PyCFunction) _wrap_Menu_Remove, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_RemoveItem", (PyCFunction) _wrap_Menu_RemoveItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_Delete", (PyCFunction) _wrap_Menu_Delete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_DeleteItem", (PyCFunction) _wrap_Menu_DeleteItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_Destroy", (PyCFunction) _wrap_Menu_Destroy, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_DestroyId", (PyCFunction) _wrap_Menu_DestroyId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_DestroyItem", (PyCFunction) _wrap_Menu_DestroyItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_GetMenuItemCount", (PyCFunction) _wrap_Menu_GetMenuItemCount, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_GetMenuItems", (PyCFunction) _wrap_Menu_GetMenuItems, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_FindItem", (PyCFunction) _wrap_Menu_FindItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_FindItemById", (PyCFunction) _wrap_Menu_FindItemById, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_FindItemByPosition", (PyCFunction) _wrap_Menu_FindItemByPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_Enable", (PyCFunction) _wrap_Menu_Enable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_IsEnabled", (PyCFunction) _wrap_Menu_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_Check", (PyCFunction) _wrap_Menu_Check, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_IsChecked", (PyCFunction) _wrap_Menu_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_SetLabel", (PyCFunction) _wrap_Menu_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_GetLabel", (PyCFunction) _wrap_Menu_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_SetHelpString", (PyCFunction) _wrap_Menu_SetHelpString, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_GetHelpString", (PyCFunction) _wrap_Menu_GetHelpString, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_SetTitle", (PyCFunction) _wrap_Menu_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_GetTitle", (PyCFunction) _wrap_Menu_GetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_SetEventHandler", (PyCFunction) _wrap_Menu_SetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_GetEventHandler", (PyCFunction) _wrap_Menu_GetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_SetInvokingWindow", (PyCFunction) _wrap_Menu_SetInvokingWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_GetInvokingWindow", (PyCFunction) _wrap_Menu_GetInvokingWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_GetStyle", (PyCFunction) _wrap_Menu_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_UpdateUI", (PyCFunction) _wrap_Menu_UpdateUI, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_GetMenuBar", (PyCFunction) _wrap_Menu_GetMenuBar, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_Attach", (PyCFunction) _wrap_Menu_Attach, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_Detach", (PyCFunction) _wrap_Menu_Detach, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_IsAttached", (PyCFunction) _wrap_Menu_IsAttached, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_SetParent", (PyCFunction) _wrap_Menu_SetParent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_GetParent", (PyCFunction) _wrap_Menu_GetParent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Menu_swigregister", Menu_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_MenuBar", (PyCFunction) _wrap_new_MenuBar, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_Append", (PyCFunction) _wrap_MenuBar_Append, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_Insert", (PyCFunction) _wrap_MenuBar_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_GetMenuCount", (PyCFunction) _wrap_MenuBar_GetMenuCount, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_GetMenu", (PyCFunction) _wrap_MenuBar_GetMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_Replace", (PyCFunction) _wrap_MenuBar_Replace, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_Remove", (PyCFunction) _wrap_MenuBar_Remove, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_EnableTop", (PyCFunction) _wrap_MenuBar_EnableTop, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_IsEnabledTop", (PyCFunction) _wrap_MenuBar_IsEnabledTop, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_SetLabelTop", (PyCFunction) _wrap_MenuBar_SetLabelTop, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_GetLabelTop", (PyCFunction) _wrap_MenuBar_GetLabelTop, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_FindMenuItem", (PyCFunction) _wrap_MenuBar_FindMenuItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_FindItemById", (PyCFunction) _wrap_MenuBar_FindItemById, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_FindMenu", (PyCFunction) _wrap_MenuBar_FindMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_Enable", (PyCFunction) _wrap_MenuBar_Enable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_Check", (PyCFunction) _wrap_MenuBar_Check, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_IsChecked", (PyCFunction) _wrap_MenuBar_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_IsEnabled", (PyCFunction) _wrap_MenuBar_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_SetLabel", (PyCFunction) _wrap_MenuBar_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_GetLabel", (PyCFunction) _wrap_MenuBar_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_SetHelpString", (PyCFunction) _wrap_MenuBar_SetHelpString, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_GetHelpString", (PyCFunction) _wrap_MenuBar_GetHelpString, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_GetFrame", (PyCFunction) _wrap_MenuBar_GetFrame, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_IsAttached", (PyCFunction) _wrap_MenuBar_IsAttached, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_Attach", (PyCFunction) _wrap_MenuBar_Attach, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_Detach", (PyCFunction) _wrap_MenuBar_Detach, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_SetAutoWindowMenu", (PyCFunction) _wrap_MenuBar_SetAutoWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_GetAutoWindowMenu", (PyCFunction) _wrap_MenuBar_GetAutoWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuBar_swigregister", MenuBar_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_MenuItem", (PyCFunction) _wrap_new_MenuItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetMenu", (PyCFunction) _wrap_MenuItem_GetMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetMenu", (PyCFunction) _wrap_MenuItem_SetMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetId", (PyCFunction) _wrap_MenuItem_SetId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetId", (PyCFunction) _wrap_MenuItem_GetId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_IsSeparator", (PyCFunction) _wrap_MenuItem_IsSeparator, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetText", (PyCFunction) _wrap_MenuItem_SetText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetLabel", (PyCFunction) _wrap_MenuItem_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetText", (PyCFunction) _wrap_MenuItem_GetText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetLabelFromText", (PyCFunction) _wrap_MenuItem_GetLabelFromText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetKind", (PyCFunction) _wrap_MenuItem_GetKind, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetKind", (PyCFunction) _wrap_MenuItem_SetKind, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetCheckable", (PyCFunction) _wrap_MenuItem_SetCheckable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_IsCheckable", (PyCFunction) _wrap_MenuItem_IsCheckable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_IsSubMenu", (PyCFunction) _wrap_MenuItem_IsSubMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetSubMenu", (PyCFunction) _wrap_MenuItem_SetSubMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetSubMenu", (PyCFunction) _wrap_MenuItem_GetSubMenu, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_Enable", (PyCFunction) _wrap_MenuItem_Enable, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_IsEnabled", (PyCFunction) _wrap_MenuItem_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_Check", (PyCFunction) _wrap_MenuItem_Check, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_IsChecked", (PyCFunction) _wrap_MenuItem_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_Toggle", (PyCFunction) _wrap_MenuItem_Toggle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetHelp", (PyCFunction) _wrap_MenuItem_SetHelp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetHelp", (PyCFunction) _wrap_MenuItem_GetHelp, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetAccel", (PyCFunction) _wrap_MenuItem_GetAccel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetAccel", (PyCFunction) _wrap_MenuItem_SetAccel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetFont", (PyCFunction) _wrap_MenuItem_SetFont, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetFont", (PyCFunction) _wrap_MenuItem_GetFont, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetTextColour", (PyCFunction) _wrap_MenuItem_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetTextColour", (PyCFunction) _wrap_MenuItem_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetBackgroundColour", (PyCFunction) _wrap_MenuItem_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetBackgroundColour", (PyCFunction) _wrap_MenuItem_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetBitmaps", (PyCFunction) _wrap_MenuItem_SetBitmaps, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetDisabledBitmap", (PyCFunction) _wrap_MenuItem_SetDisabledBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetDisabledBitmap", (PyCFunction) _wrap_MenuItem_GetDisabledBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetMarginWidth", (PyCFunction) _wrap_MenuItem_SetMarginWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetMarginWidth", (PyCFunction) _wrap_MenuItem_GetMarginWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetDefaultMarginWidth", (PyCFunction) _wrap_MenuItem_GetDefaultMarginWidth, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_IsOwnerDrawn", (PyCFunction) _wrap_MenuItem_IsOwnerDrawn, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetOwnerDrawn", (PyCFunction) _wrap_MenuItem_SetOwnerDrawn, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_ResetOwnerDrawn", (PyCFunction) _wrap_MenuItem_ResetOwnerDrawn, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_SetBitmap", (PyCFunction) _wrap_MenuItem_SetBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_GetBitmap", (PyCFunction) _wrap_MenuItem_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"MenuItem_swigregister", MenuItem_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_Control", (PyCFunction) _wrap_new_Control, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreControl", (PyCFunction) _wrap_new_PreControl, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxControl_Create", (PyCFunction) _wrap_wxControl_Create, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxControl_Command", (PyCFunction) _wrap_wxControl_Command, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxControl_GetLabel", (PyCFunction) _wrap_wxControl_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxControl_SetLabel", (PyCFunction) _wrap_wxControl_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxControl_GetClassDefaultAttributes", (PyCFunction) _wrap_wxControl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxControl_swigregister", wxControl_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxItemContainer_Append", (PyCFunction) _wrap_wxItemContainer_Append, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_AppendItems", (PyCFunction) _wrap_wxItemContainer_AppendItems, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_Insert", (PyCFunction) _wrap_wxItemContainer_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_Clear", (PyCFunction) _wrap_wxItemContainer_Clear, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_Delete", (PyCFunction) _wrap_wxItemContainer_Delete, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_GetClientData", (PyCFunction) _wrap_wxItemContainer_GetClientData, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_SetClientData", (PyCFunction) _wrap_wxItemContainer_SetClientData, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_GetCount", (PyCFunction) _wrap_wxItemContainer_GetCount, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_IsEmpty", (PyCFunction) _wrap_wxItemContainer_IsEmpty, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_GetString", (PyCFunction) _wrap_wxItemContainer_GetString, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_GetStrings", (PyCFunction) _wrap_wxItemContainer_GetStrings, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_SetString", (PyCFunction) _wrap_wxItemContainer_SetString, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_FindString", (PyCFunction) _wrap_wxItemContainer_FindString, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_SetSelection", (PyCFunction) _wrap_wxItemContainer_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_GetSelection", (PyCFunction) _wrap_wxItemContainer_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_SetStringSelection", (PyCFunction) _wrap_wxItemContainer_SetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_GetStringSelection", (PyCFunction) _wrap_wxItemContainer_GetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_Select", (PyCFunction) _wrap_wxItemContainer_Select, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxItemContainer_swigregister", wxItemContainer_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxControlWithItems_swigregister", wxControlWithItems_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxSizerItem", (PyCFunction) _wrap_new_wxSizerItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Control_Create", (PyCFunction) _wrap_Control_Create, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Control_Command", (PyCFunction) _wrap_Control_Command, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Control_GetLabel", (PyCFunction) _wrap_Control_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Control_SetLabel", (PyCFunction) _wrap_Control_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Control_GetClassDefaultAttributes", (PyCFunction) _wrap_Control_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Control_swigregister", Control_swigregister, METH_VARARGS, NULL},
+        { (char *)"ItemContainer_Append", (PyCFunction) _wrap_ItemContainer_Append, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_AppendItems", (PyCFunction) _wrap_ItemContainer_AppendItems, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_Insert", (PyCFunction) _wrap_ItemContainer_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_Clear", (PyCFunction) _wrap_ItemContainer_Clear, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_Delete", (PyCFunction) _wrap_ItemContainer_Delete, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_GetClientData", (PyCFunction) _wrap_ItemContainer_GetClientData, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_SetClientData", (PyCFunction) _wrap_ItemContainer_SetClientData, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_GetCount", (PyCFunction) _wrap_ItemContainer_GetCount, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_IsEmpty", (PyCFunction) _wrap_ItemContainer_IsEmpty, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_GetString", (PyCFunction) _wrap_ItemContainer_GetString, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_GetStrings", (PyCFunction) _wrap_ItemContainer_GetStrings, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_SetString", (PyCFunction) _wrap_ItemContainer_SetString, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_FindString", (PyCFunction) _wrap_ItemContainer_FindString, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_SetSelection", (PyCFunction) _wrap_ItemContainer_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_GetSelection", (PyCFunction) _wrap_ItemContainer_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_SetStringSelection", (PyCFunction) _wrap_ItemContainer_SetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_GetStringSelection", (PyCFunction) _wrap_ItemContainer_GetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_Select", (PyCFunction) _wrap_ItemContainer_Select, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ItemContainer_swigregister", ItemContainer_swigregister, METH_VARARGS, NULL},
+        { (char *)"ControlWithItems_swigregister", ControlWithItems_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_SizerItem", (PyCFunction) _wrap_new_SizerItem, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_SizerItemWindow", (PyCFunction) _wrap_new_SizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_SizerItemSpacer", (PyCFunction) _wrap_new_SizerItemSpacer, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_SizerItemSizer", (PyCFunction) _wrap_new_SizerItemSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_DeleteWindows", (PyCFunction) _wrap_wxSizerItem_DeleteWindows, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_DetachSizer", (PyCFunction) _wrap_wxSizerItem_DetachSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_GetSize", (PyCFunction) _wrap_wxSizerItem_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_CalcMin", (PyCFunction) _wrap_wxSizerItem_CalcMin, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_SetDimension", (PyCFunction) _wrap_wxSizerItem_SetDimension, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_GetMinSize", (PyCFunction) _wrap_wxSizerItem_GetMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_GetMinSizeWithBorder", (PyCFunction) _wrap_wxSizerItem_GetMinSizeWithBorder, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_SetInitSize", (PyCFunction) _wrap_wxSizerItem_SetInitSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_SetRatioWH", (PyCFunction) _wrap_wxSizerItem_SetRatioWH, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_SetRatioSize", (PyCFunction) _wrap_wxSizerItem_SetRatioSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_SetRatio", (PyCFunction) _wrap_wxSizerItem_SetRatio, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_GetRatio", (PyCFunction) _wrap_wxSizerItem_GetRatio, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_GetRect", (PyCFunction) _wrap_wxSizerItem_GetRect, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_IsWindow", (PyCFunction) _wrap_wxSizerItem_IsWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_IsSizer", (PyCFunction) _wrap_wxSizerItem_IsSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_IsSpacer", (PyCFunction) _wrap_wxSizerItem_IsSpacer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_SetProportion", (PyCFunction) _wrap_wxSizerItem_SetProportion, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_GetProportion", (PyCFunction) _wrap_wxSizerItem_GetProportion, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_SetFlag", (PyCFunction) _wrap_wxSizerItem_SetFlag, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_GetFlag", (PyCFunction) _wrap_wxSizerItem_GetFlag, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_SetBorder", (PyCFunction) _wrap_wxSizerItem_SetBorder, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_GetBorder", (PyCFunction) _wrap_wxSizerItem_GetBorder, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_GetWindow", (PyCFunction) _wrap_wxSizerItem_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_SetWindow", (PyCFunction) _wrap_wxSizerItem_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_GetSizer", (PyCFunction) _wrap_wxSizerItem_GetSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_SetSizer", (PyCFunction) _wrap_wxSizerItem_SetSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_GetSpacer", (PyCFunction) _wrap_wxSizerItem_GetSpacer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_SetSpacer", (PyCFunction) _wrap_wxSizerItem_SetSpacer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_Show", (PyCFunction) _wrap_wxSizerItem_Show, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_IsShown", (PyCFunction) _wrap_wxSizerItem_IsShown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_GetPosition", (PyCFunction) _wrap_wxSizerItem_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_GetUserData", (PyCFunction) _wrap_wxSizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizerItem_swigregister", wxSizerItem_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxSizer__setOORInfo", (PyCFunction) _wrap_wxSizer__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_Add", (PyCFunction) _wrap_wxSizer_Add, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_Insert", (PyCFunction) _wrap_wxSizer_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_Prepend", (PyCFunction) _wrap_wxSizer_Prepend, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_Remove", (PyCFunction) _wrap_wxSizer_Remove, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_Detach", (PyCFunction) _wrap_wxSizer_Detach, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_GetItem", (PyCFunction) _wrap_wxSizer_GetItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer__SetItemMinSize", (PyCFunction) _wrap_wxSizer__SetItemMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_AddItem", (PyCFunction) _wrap_wxSizer_AddItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_InsertItem", (PyCFunction) _wrap_wxSizer_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_PrependItem", (PyCFunction) _wrap_wxSizer_PrependItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_SetDimension", (PyCFunction) _wrap_wxSizer_SetDimension, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_SetMinSize", (PyCFunction) _wrap_wxSizer_SetMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_GetSize", (PyCFunction) _wrap_wxSizer_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_GetPosition", (PyCFunction) _wrap_wxSizer_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_GetMinSize", (PyCFunction) _wrap_wxSizer_GetMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_RecalcSizes", (PyCFunction) _wrap_wxSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_CalcMin", (PyCFunction) _wrap_wxSizer_CalcMin, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_Layout", (PyCFunction) _wrap_wxSizer_Layout, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_Fit", (PyCFunction) _wrap_wxSizer_Fit, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_FitInside", (PyCFunction) _wrap_wxSizer_FitInside, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_SetSizeHints", (PyCFunction) _wrap_wxSizer_SetSizeHints, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_SetVirtualSizeHints", (PyCFunction) _wrap_wxSizer_SetVirtualSizeHints, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_Clear", (PyCFunction) _wrap_wxSizer_Clear, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_DeleteWindows", (PyCFunction) _wrap_wxSizer_DeleteWindows, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_GetChildren", (PyCFunction) _wrap_wxSizer_GetChildren, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_Show", (PyCFunction) _wrap_wxSizer_Show, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_IsShown", (PyCFunction) _wrap_wxSizer_IsShown, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_ShowItems", (PyCFunction) _wrap_wxSizer_ShowItems, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxSizer_swigregister", wxSizer_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxPySizer", (PyCFunction) _wrap_new_wxPySizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPySizer__setCallbackInfo", (PyCFunction) _wrap_wxPySizer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxPySizer_swigregister", wxPySizer_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxBoxSizer", (PyCFunction) _wrap_new_wxBoxSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxBoxSizer_GetOrientation", (PyCFunction) _wrap_wxBoxSizer_GetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxBoxSizer_SetOrientation", (PyCFunction) _wrap_wxBoxSizer_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxBoxSizer_swigregister", wxBoxSizer_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxStaticBoxSizer", (PyCFunction) _wrap_new_wxStaticBoxSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxStaticBoxSizer_GetStaticBox", (PyCFunction) _wrap_wxStaticBoxSizer_GetStaticBox, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxStaticBoxSizer_swigregister", wxStaticBoxSizer_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxGridSizer", (PyCFunction) _wrap_new_wxGridSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridSizer_SetCols", (PyCFunction) _wrap_wxGridSizer_SetCols, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridSizer_SetRows", (PyCFunction) _wrap_wxGridSizer_SetRows, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridSizer_SetVGap", (PyCFunction) _wrap_wxGridSizer_SetVGap, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridSizer_SetHGap", (PyCFunction) _wrap_wxGridSizer_SetHGap, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridSizer_GetCols", (PyCFunction) _wrap_wxGridSizer_GetCols, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridSizer_GetRows", (PyCFunction) _wrap_wxGridSizer_GetRows, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridSizer_GetVGap", (PyCFunction) _wrap_wxGridSizer_GetVGap, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridSizer_GetHGap", (PyCFunction) _wrap_wxGridSizer_GetHGap, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridSizer_swigregister", wxGridSizer_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxFlexGridSizer", (PyCFunction) _wrap_new_wxFlexGridSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFlexGridSizer_AddGrowableRow", (PyCFunction) _wrap_wxFlexGridSizer_AddGrowableRow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFlexGridSizer_RemoveGrowableRow", (PyCFunction) _wrap_wxFlexGridSizer_RemoveGrowableRow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFlexGridSizer_AddGrowableCol", (PyCFunction) _wrap_wxFlexGridSizer_AddGrowableCol, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFlexGridSizer_RemoveGrowableCol", (PyCFunction) _wrap_wxFlexGridSizer_RemoveGrowableCol, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFlexGridSizer_SetFlexibleDirection", (PyCFunction) _wrap_wxFlexGridSizer_SetFlexibleDirection, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFlexGridSizer_GetFlexibleDirection", (PyCFunction) _wrap_wxFlexGridSizer_GetFlexibleDirection, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFlexGridSizer_SetNonFlexibleGrowMode", (PyCFunction) _wrap_wxFlexGridSizer_SetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFlexGridSizer_GetNonFlexibleGrowMode", (PyCFunction) _wrap_wxFlexGridSizer_GetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFlexGridSizer_GetRowHeights", (PyCFunction) _wrap_wxFlexGridSizer_GetRowHeights, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFlexGridSizer_GetColWidths", (PyCFunction) _wrap_wxFlexGridSizer_GetColWidths, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxFlexGridSizer_swigregister", wxFlexGridSizer_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxStdDialogButtonSizer", (PyCFunction) _wrap_new_wxStdDialogButtonSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxStdDialogButtonSizer_AddButton", (PyCFunction) _wrap_wxStdDialogButtonSizer_AddButton, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxStdDialogButtonSizer_Realize", (PyCFunction) _wrap_wxStdDialogButtonSizer_Realize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxStdDialogButtonSizer_SetAffirmativeButton", (PyCFunction) _wrap_wxStdDialogButtonSizer_SetAffirmativeButton, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxStdDialogButtonSizer_SetNegativeButton", (PyCFunction) _wrap_wxStdDialogButtonSizer_SetNegativeButton, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxStdDialogButtonSizer_SetCancelButton", (PyCFunction) _wrap_wxStdDialogButtonSizer_SetCancelButton, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxStdDialogButtonSizer_GetAffirmativeButton", (PyCFunction) _wrap_wxStdDialogButtonSizer_GetAffirmativeButton, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxStdDialogButtonSizer_GetApplyButton", (PyCFunction) _wrap_wxStdDialogButtonSizer_GetApplyButton, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxStdDialogButtonSizer_GetNegativeButton", (PyCFunction) _wrap_wxStdDialogButtonSizer_GetNegativeButton, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxStdDialogButtonSizer_GetCancelButton", (PyCFunction) _wrap_wxStdDialogButtonSizer_GetCancelButton, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxStdDialogButtonSizer_GetHelpButton", (PyCFunction) _wrap_wxStdDialogButtonSizer_GetHelpButton, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxStdDialogButtonSizer_swigregister", wxStdDialogButtonSizer_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxGBPosition", (PyCFunction) _wrap_new_wxGBPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBPosition_GetRow", (PyCFunction) _wrap_wxGBPosition_GetRow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBPosition_GetCol", (PyCFunction) _wrap_wxGBPosition_GetCol, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBPosition_SetRow", (PyCFunction) _wrap_wxGBPosition_SetRow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBPosition_SetCol", (PyCFunction) _wrap_wxGBPosition_SetCol, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBPosition___eq__", (PyCFunction) _wrap_wxGBPosition___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBPosition___ne__", (PyCFunction) _wrap_wxGBPosition___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBPosition_Set", (PyCFunction) _wrap_wxGBPosition_Set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBPosition_Get", (PyCFunction) _wrap_wxGBPosition_Get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBPosition_swigregister", wxGBPosition_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxGBSpan", (PyCFunction) _wrap_new_wxGBSpan, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSpan_GetRowspan", (PyCFunction) _wrap_wxGBSpan_GetRowspan, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSpan_GetColspan", (PyCFunction) _wrap_wxGBSpan_GetColspan, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSpan_SetRowspan", (PyCFunction) _wrap_wxGBSpan_SetRowspan, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSpan_SetColspan", (PyCFunction) _wrap_wxGBSpan_SetColspan, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSpan___eq__", (PyCFunction) _wrap_wxGBSpan___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSpan___ne__", (PyCFunction) _wrap_wxGBSpan___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSpan_Set", (PyCFunction) _wrap_wxGBSpan_Set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSpan_Get", (PyCFunction) _wrap_wxGBSpan_Get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSpan_swigregister", wxGBSpan_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxGBSizerItem", (PyCFunction) _wrap_new_wxGBSizerItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_DeleteWindows", (PyCFunction) _wrap_SizerItem_DeleteWindows, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_DetachSizer", (PyCFunction) _wrap_SizerItem_DetachSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_GetSize", (PyCFunction) _wrap_SizerItem_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_CalcMin", (PyCFunction) _wrap_SizerItem_CalcMin, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_SetDimension", (PyCFunction) _wrap_SizerItem_SetDimension, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_GetMinSize", (PyCFunction) _wrap_SizerItem_GetMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_GetMinSizeWithBorder", (PyCFunction) _wrap_SizerItem_GetMinSizeWithBorder, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_SetInitSize", (PyCFunction) _wrap_SizerItem_SetInitSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_SetRatioWH", (PyCFunction) _wrap_SizerItem_SetRatioWH, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_SetRatioSize", (PyCFunction) _wrap_SizerItem_SetRatioSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_SetRatio", (PyCFunction) _wrap_SizerItem_SetRatio, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_GetRatio", (PyCFunction) _wrap_SizerItem_GetRatio, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_GetRect", (PyCFunction) _wrap_SizerItem_GetRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_IsWindow", (PyCFunction) _wrap_SizerItem_IsWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_IsSizer", (PyCFunction) _wrap_SizerItem_IsSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_IsSpacer", (PyCFunction) _wrap_SizerItem_IsSpacer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_SetProportion", (PyCFunction) _wrap_SizerItem_SetProportion, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_GetProportion", (PyCFunction) _wrap_SizerItem_GetProportion, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_SetFlag", (PyCFunction) _wrap_SizerItem_SetFlag, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_GetFlag", (PyCFunction) _wrap_SizerItem_GetFlag, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_SetBorder", (PyCFunction) _wrap_SizerItem_SetBorder, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_GetBorder", (PyCFunction) _wrap_SizerItem_GetBorder, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_GetWindow", (PyCFunction) _wrap_SizerItem_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_SetWindow", (PyCFunction) _wrap_SizerItem_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_GetSizer", (PyCFunction) _wrap_SizerItem_GetSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_SetSizer", (PyCFunction) _wrap_SizerItem_SetSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_GetSpacer", (PyCFunction) _wrap_SizerItem_GetSpacer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_SetSpacer", (PyCFunction) _wrap_SizerItem_SetSpacer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_Show", (PyCFunction) _wrap_SizerItem_Show, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_IsShown", (PyCFunction) _wrap_SizerItem_IsShown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_GetPosition", (PyCFunction) _wrap_SizerItem_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_GetUserData", (PyCFunction) _wrap_SizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SizerItem_swigregister", SizerItem_swigregister, METH_VARARGS, NULL},
+        { (char *)"Sizer__setOORInfo", (PyCFunction) _wrap_Sizer__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_Add", (PyCFunction) _wrap_Sizer_Add, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_Insert", (PyCFunction) _wrap_Sizer_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_Prepend", (PyCFunction) _wrap_Sizer_Prepend, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_Remove", (PyCFunction) _wrap_Sizer_Remove, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_Detach", (PyCFunction) _wrap_Sizer_Detach, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_GetItem", (PyCFunction) _wrap_Sizer_GetItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer__SetItemMinSize", (PyCFunction) _wrap_Sizer__SetItemMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_AddItem", (PyCFunction) _wrap_Sizer_AddItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_InsertItem", (PyCFunction) _wrap_Sizer_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_PrependItem", (PyCFunction) _wrap_Sizer_PrependItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_SetDimension", (PyCFunction) _wrap_Sizer_SetDimension, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_SetMinSize", (PyCFunction) _wrap_Sizer_SetMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_GetSize", (PyCFunction) _wrap_Sizer_GetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_GetPosition", (PyCFunction) _wrap_Sizer_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_GetMinSize", (PyCFunction) _wrap_Sizer_GetMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_RecalcSizes", (PyCFunction) _wrap_Sizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_CalcMin", (PyCFunction) _wrap_Sizer_CalcMin, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_Layout", (PyCFunction) _wrap_Sizer_Layout, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_Fit", (PyCFunction) _wrap_Sizer_Fit, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_FitInside", (PyCFunction) _wrap_Sizer_FitInside, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_SetSizeHints", (PyCFunction) _wrap_Sizer_SetSizeHints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_SetVirtualSizeHints", (PyCFunction) _wrap_Sizer_SetVirtualSizeHints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_Clear", (PyCFunction) _wrap_Sizer_Clear, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_DeleteWindows", (PyCFunction) _wrap_Sizer_DeleteWindows, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_GetChildren", (PyCFunction) _wrap_Sizer_GetChildren, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_Show", (PyCFunction) _wrap_Sizer_Show, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_IsShown", (PyCFunction) _wrap_Sizer_IsShown, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_ShowItems", (PyCFunction) _wrap_Sizer_ShowItems, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Sizer_swigregister", Sizer_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_PySizer", (PyCFunction) _wrap_new_PySizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PySizer__setCallbackInfo", (PyCFunction) _wrap_PySizer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PySizer_swigregister", PySizer_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_BoxSizer", (PyCFunction) _wrap_new_BoxSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"BoxSizer_GetOrientation", (PyCFunction) _wrap_BoxSizer_GetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"BoxSizer_SetOrientation", (PyCFunction) _wrap_BoxSizer_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"BoxSizer_swigregister", BoxSizer_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_StaticBoxSizer", (PyCFunction) _wrap_new_StaticBoxSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StaticBoxSizer_GetStaticBox", (PyCFunction) _wrap_StaticBoxSizer_GetStaticBox, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StaticBoxSizer_swigregister", StaticBoxSizer_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_GridSizer", (PyCFunction) _wrap_new_GridSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridSizer_SetCols", (PyCFunction) _wrap_GridSizer_SetCols, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridSizer_SetRows", (PyCFunction) _wrap_GridSizer_SetRows, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridSizer_SetVGap", (PyCFunction) _wrap_GridSizer_SetVGap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridSizer_SetHGap", (PyCFunction) _wrap_GridSizer_SetHGap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridSizer_GetCols", (PyCFunction) _wrap_GridSizer_GetCols, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridSizer_GetRows", (PyCFunction) _wrap_GridSizer_GetRows, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridSizer_GetVGap", (PyCFunction) _wrap_GridSizer_GetVGap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridSizer_GetHGap", (PyCFunction) _wrap_GridSizer_GetHGap, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridSizer_swigregister", GridSizer_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_FlexGridSizer", (PyCFunction) _wrap_new_FlexGridSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FlexGridSizer_AddGrowableRow", (PyCFunction) _wrap_FlexGridSizer_AddGrowableRow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FlexGridSizer_RemoveGrowableRow", (PyCFunction) _wrap_FlexGridSizer_RemoveGrowableRow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FlexGridSizer_AddGrowableCol", (PyCFunction) _wrap_FlexGridSizer_AddGrowableCol, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FlexGridSizer_RemoveGrowableCol", (PyCFunction) _wrap_FlexGridSizer_RemoveGrowableCol, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FlexGridSizer_SetFlexibleDirection", (PyCFunction) _wrap_FlexGridSizer_SetFlexibleDirection, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FlexGridSizer_GetFlexibleDirection", (PyCFunction) _wrap_FlexGridSizer_GetFlexibleDirection, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FlexGridSizer_SetNonFlexibleGrowMode", (PyCFunction) _wrap_FlexGridSizer_SetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FlexGridSizer_GetNonFlexibleGrowMode", (PyCFunction) _wrap_FlexGridSizer_GetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FlexGridSizer_GetRowHeights", (PyCFunction) _wrap_FlexGridSizer_GetRowHeights, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FlexGridSizer_GetColWidths", (PyCFunction) _wrap_FlexGridSizer_GetColWidths, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"FlexGridSizer_swigregister", FlexGridSizer_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_StdDialogButtonSizer", (PyCFunction) _wrap_new_StdDialogButtonSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StdDialogButtonSizer_AddButton", (PyCFunction) _wrap_StdDialogButtonSizer_AddButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StdDialogButtonSizer_Realize", (PyCFunction) _wrap_StdDialogButtonSizer_Realize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StdDialogButtonSizer_SetAffirmativeButton", (PyCFunction) _wrap_StdDialogButtonSizer_SetAffirmativeButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StdDialogButtonSizer_SetNegativeButton", (PyCFunction) _wrap_StdDialogButtonSizer_SetNegativeButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StdDialogButtonSizer_SetCancelButton", (PyCFunction) _wrap_StdDialogButtonSizer_SetCancelButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StdDialogButtonSizer_GetAffirmativeButton", (PyCFunction) _wrap_StdDialogButtonSizer_GetAffirmativeButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StdDialogButtonSizer_GetApplyButton", (PyCFunction) _wrap_StdDialogButtonSizer_GetApplyButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StdDialogButtonSizer_GetNegativeButton", (PyCFunction) _wrap_StdDialogButtonSizer_GetNegativeButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StdDialogButtonSizer_GetCancelButton", (PyCFunction) _wrap_StdDialogButtonSizer_GetCancelButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StdDialogButtonSizer_GetHelpButton", (PyCFunction) _wrap_StdDialogButtonSizer_GetHelpButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StdDialogButtonSizer_swigregister", StdDialogButtonSizer_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_GBPosition", (PyCFunction) _wrap_new_GBPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBPosition_GetRow", (PyCFunction) _wrap_GBPosition_GetRow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBPosition_GetCol", (PyCFunction) _wrap_GBPosition_GetCol, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBPosition_SetRow", (PyCFunction) _wrap_GBPosition_SetRow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBPosition_SetCol", (PyCFunction) _wrap_GBPosition_SetCol, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBPosition___eq__", (PyCFunction) _wrap_GBPosition___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBPosition___ne__", (PyCFunction) _wrap_GBPosition___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBPosition_Set", (PyCFunction) _wrap_GBPosition_Set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBPosition_Get", (PyCFunction) _wrap_GBPosition_Get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBPosition_swigregister", GBPosition_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_GBSpan", (PyCFunction) _wrap_new_GBSpan, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSpan_GetRowspan", (PyCFunction) _wrap_GBSpan_GetRowspan, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSpan_GetColspan", (PyCFunction) _wrap_GBSpan_GetColspan, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSpan_SetRowspan", (PyCFunction) _wrap_GBSpan_SetRowspan, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSpan_SetColspan", (PyCFunction) _wrap_GBSpan_SetColspan, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSpan___eq__", (PyCFunction) _wrap_GBSpan___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSpan___ne__", (PyCFunction) _wrap_GBSpan___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSpan_Set", (PyCFunction) _wrap_GBSpan_Set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSpan_Get", (PyCFunction) _wrap_GBSpan_Get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSpan_swigregister", GBSpan_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_GBSizerItem", (PyCFunction) _wrap_new_GBSizerItem, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_GBSizerItemWindow", (PyCFunction) _wrap_new_GBSizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_GBSizerItemSizer", (PyCFunction) _wrap_new_GBSizerItemSizer, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_GBSizerItemSpacer", (PyCFunction) _wrap_new_GBSizerItemSpacer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSizerItem_GetPos", (PyCFunction) _wrap_wxGBSizerItem_GetPos, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSizerItem_GetSpan", (PyCFunction) _wrap_wxGBSizerItem_GetSpan, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSizerItem_SetPos", (PyCFunction) _wrap_wxGBSizerItem_SetPos, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSizerItem_SetSpan", (PyCFunction) _wrap_wxGBSizerItem_SetSpan, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSizerItem_Intersects", (PyCFunction) _wrap_wxGBSizerItem_Intersects, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSizerItem_IntersectsPos", (PyCFunction) _wrap_wxGBSizerItem_IntersectsPos, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSizerItem_GetEndPos", (PyCFunction) _wrap_wxGBSizerItem_GetEndPos, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSizerItem_GetGBSizer", (PyCFunction) _wrap_wxGBSizerItem_GetGBSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSizerItem_SetGBSizer", (PyCFunction) _wrap_wxGBSizerItem_SetGBSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGBSizerItem_swigregister", wxGBSizerItem_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_wxGridBagSizer", (PyCFunction) _wrap_new_wxGridBagSizer, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridBagSizer_Add", (PyCFunction) _wrap_wxGridBagSizer_Add, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridBagSizer_AddItem", (PyCFunction) _wrap_wxGridBagSizer_AddItem, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridBagSizer_GetCellSize", (PyCFunction) _wrap_wxGridBagSizer_GetCellSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridBagSizer_GetEmptyCellSize", (PyCFunction) _wrap_wxGridBagSizer_GetEmptyCellSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridBagSizer_SetEmptyCellSize", (PyCFunction) _wrap_wxGridBagSizer_SetEmptyCellSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridBagSizer_GetItemPosition", _wrap_wxGridBagSizer_GetItemPosition, METH_VARARGS, NULL},
-        { (char *)"wxGridBagSizer_SetItemPosition", _wrap_wxGridBagSizer_SetItemPosition, METH_VARARGS, NULL},
-        { (char *)"wxGridBagSizer_GetItemSpan", _wrap_wxGridBagSizer_GetItemSpan, METH_VARARGS, NULL},
-        { (char *)"wxGridBagSizer_SetItemSpan", _wrap_wxGridBagSizer_SetItemSpan, METH_VARARGS, NULL},
-        { (char *)"wxGridBagSizer_FindItem", _wrap_wxGridBagSizer_FindItem, METH_VARARGS, NULL},
-        { (char *)"wxGridBagSizer_FindItemAtPosition", (PyCFunction) _wrap_wxGridBagSizer_FindItemAtPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridBagSizer_FindItemAtPoint", (PyCFunction) _wrap_wxGridBagSizer_FindItemAtPoint, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridBagSizer_CheckForIntersection", (PyCFunction) _wrap_wxGridBagSizer_CheckForIntersection, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridBagSizer_CheckForIntersectionPos", (PyCFunction) _wrap_wxGridBagSizer_CheckForIntersectionPos, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxGridBagSizer_swigregister", wxGridBagSizer_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_Set", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Set, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_LeftOf", (PyCFunction) _wrap_wxIndividualLayoutConstraint_LeftOf, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_RightOf", (PyCFunction) _wrap_wxIndividualLayoutConstraint_RightOf, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_Above", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Above, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_Below", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Below, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_SameAs", (PyCFunction) _wrap_wxIndividualLayoutConstraint_SameAs, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_PercentOf", (PyCFunction) _wrap_wxIndividualLayoutConstraint_PercentOf, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_Absolute", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Absolute, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_Unconstrained", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Unconstrained, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_AsIs", (PyCFunction) _wrap_wxIndividualLayoutConstraint_AsIs, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_GetOtherWindow", (PyCFunction) _wrap_wxIndividualLayoutConstraint_GetOtherWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_GetMyEdge", (PyCFunction) _wrap_wxIndividualLayoutConstraint_GetMyEdge, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_SetEdge", (PyCFunction) _wrap_wxIndividualLayoutConstraint_SetEdge, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_SetValue", (PyCFunction) _wrap_wxIndividualLayoutConstraint_SetValue, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_GetMargin", (PyCFunction) _wrap_wxIndividualLayoutConstraint_GetMargin, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_SetMargin", (PyCFunction) _wrap_wxIndividualLayoutConstraint_SetMargin, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_GetValue", (PyCFunction) _wrap_wxIndividualLayoutConstraint_GetValue, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_GetPercent", (PyCFunction) _wrap_wxIndividualLayoutConstraint_GetPercent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_GetOtherEdge", (PyCFunction) _wrap_wxIndividualLayoutConstraint_GetOtherEdge, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_GetDone", (PyCFunction) _wrap_wxIndividualLayoutConstraint_GetDone, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_SetDone", (PyCFunction) _wrap_wxIndividualLayoutConstraint_SetDone, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_GetRelationship", (PyCFunction) _wrap_wxIndividualLayoutConstraint_GetRelationship, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_SetRelationship", (PyCFunction) _wrap_wxIndividualLayoutConstraint_SetRelationship, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_ResetIfWin", (PyCFunction) _wrap_wxIndividualLayoutConstraint_ResetIfWin, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_SatisfyConstraint", (PyCFunction) _wrap_wxIndividualLayoutConstraint_SatisfyConstraint, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_GetEdge", (PyCFunction) _wrap_wxIndividualLayoutConstraint_GetEdge, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxIndividualLayoutConstraint_swigregister", wxIndividualLayoutConstraint_swigregister, METH_VARARGS, NULL},
-        { (char *)"wxLayoutConstraints_left_get", (PyCFunction) _wrap_wxLayoutConstraints_left_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxLayoutConstraints_top_get", (PyCFunction) _wrap_wxLayoutConstraints_top_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxLayoutConstraints_right_get", (PyCFunction) _wrap_wxLayoutConstraints_right_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxLayoutConstraints_bottom_get", (PyCFunction) _wrap_wxLayoutConstraints_bottom_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxLayoutConstraints_width_get", (PyCFunction) _wrap_wxLayoutConstraints_width_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxLayoutConstraints_height_get", (PyCFunction) _wrap_wxLayoutConstraints_height_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxLayoutConstraints_centreX_get", (PyCFunction) _wrap_wxLayoutConstraints_centreX_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxLayoutConstraints_centreY_get", (PyCFunction) _wrap_wxLayoutConstraints_centreY_get, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"new_wxLayoutConstraints", (PyCFunction) _wrap_new_wxLayoutConstraints, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxLayoutConstraints_SatisfyConstraints", (PyCFunction) _wrap_wxLayoutConstraints_SatisfyConstraints, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxLayoutConstraints_AreSatisfied", (PyCFunction) _wrap_wxLayoutConstraints_AreSatisfied, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"wxLayoutConstraints_swigregister", wxLayoutConstraints_swigregister, METH_VARARGS, NULL},
+        { (char *)"GBSizerItem_GetPos", (PyCFunction) _wrap_GBSizerItem_GetPos, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSizerItem_GetSpan", (PyCFunction) _wrap_GBSizerItem_GetSpan, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSizerItem_SetPos", (PyCFunction) _wrap_GBSizerItem_SetPos, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSizerItem_SetSpan", (PyCFunction) _wrap_GBSizerItem_SetSpan, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSizerItem_Intersects", (PyCFunction) _wrap_GBSizerItem_Intersects, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSizerItem_IntersectsPos", (PyCFunction) _wrap_GBSizerItem_IntersectsPos, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSizerItem_GetEndPos", (PyCFunction) _wrap_GBSizerItem_GetEndPos, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSizerItem_GetGBSizer", (PyCFunction) _wrap_GBSizerItem_GetGBSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSizerItem_SetGBSizer", (PyCFunction) _wrap_GBSizerItem_SetGBSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GBSizerItem_swigregister", GBSizerItem_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_GridBagSizer", (PyCFunction) _wrap_new_GridBagSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridBagSizer_Add", (PyCFunction) _wrap_GridBagSizer_Add, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridBagSizer_AddItem", (PyCFunction) _wrap_GridBagSizer_AddItem, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridBagSizer_GetCellSize", (PyCFunction) _wrap_GridBagSizer_GetCellSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridBagSizer_GetEmptyCellSize", (PyCFunction) _wrap_GridBagSizer_GetEmptyCellSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridBagSizer_SetEmptyCellSize", (PyCFunction) _wrap_GridBagSizer_SetEmptyCellSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridBagSizer_GetItemPosition", _wrap_GridBagSizer_GetItemPosition, METH_VARARGS, NULL},
+        { (char *)"GridBagSizer_SetItemPosition", _wrap_GridBagSizer_SetItemPosition, METH_VARARGS, NULL},
+        { (char *)"GridBagSizer_GetItemSpan", _wrap_GridBagSizer_GetItemSpan, METH_VARARGS, NULL},
+        { (char *)"GridBagSizer_SetItemSpan", _wrap_GridBagSizer_SetItemSpan, METH_VARARGS, NULL},
+        { (char *)"GridBagSizer_FindItem", _wrap_GridBagSizer_FindItem, METH_VARARGS, NULL},
+        { (char *)"GridBagSizer_FindItemAtPosition", (PyCFunction) _wrap_GridBagSizer_FindItemAtPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridBagSizer_FindItemAtPoint", (PyCFunction) _wrap_GridBagSizer_FindItemAtPoint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridBagSizer_CheckForIntersection", (PyCFunction) _wrap_GridBagSizer_CheckForIntersection, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridBagSizer_CheckForIntersectionPos", (PyCFunction) _wrap_GridBagSizer_CheckForIntersectionPos, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GridBagSizer_swigregister", GridBagSizer_swigregister, METH_VARARGS, NULL},
+        { (char *)"IndividualLayoutConstraint_Set", (PyCFunction) _wrap_IndividualLayoutConstraint_Set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_LeftOf", (PyCFunction) _wrap_IndividualLayoutConstraint_LeftOf, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_RightOf", (PyCFunction) _wrap_IndividualLayoutConstraint_RightOf, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_Above", (PyCFunction) _wrap_IndividualLayoutConstraint_Above, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_Below", (PyCFunction) _wrap_IndividualLayoutConstraint_Below, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_SameAs", (PyCFunction) _wrap_IndividualLayoutConstraint_SameAs, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_PercentOf", (PyCFunction) _wrap_IndividualLayoutConstraint_PercentOf, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_Absolute", (PyCFunction) _wrap_IndividualLayoutConstraint_Absolute, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_Unconstrained", (PyCFunction) _wrap_IndividualLayoutConstraint_Unconstrained, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_AsIs", (PyCFunction) _wrap_IndividualLayoutConstraint_AsIs, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_GetOtherWindow", (PyCFunction) _wrap_IndividualLayoutConstraint_GetOtherWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_GetMyEdge", (PyCFunction) _wrap_IndividualLayoutConstraint_GetMyEdge, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_SetEdge", (PyCFunction) _wrap_IndividualLayoutConstraint_SetEdge, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_SetValue", (PyCFunction) _wrap_IndividualLayoutConstraint_SetValue, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_GetMargin", (PyCFunction) _wrap_IndividualLayoutConstraint_GetMargin, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_SetMargin", (PyCFunction) _wrap_IndividualLayoutConstraint_SetMargin, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_GetValue", (PyCFunction) _wrap_IndividualLayoutConstraint_GetValue, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_GetPercent", (PyCFunction) _wrap_IndividualLayoutConstraint_GetPercent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_GetOtherEdge", (PyCFunction) _wrap_IndividualLayoutConstraint_GetOtherEdge, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_GetDone", (PyCFunction) _wrap_IndividualLayoutConstraint_GetDone, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_SetDone", (PyCFunction) _wrap_IndividualLayoutConstraint_SetDone, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_GetRelationship", (PyCFunction) _wrap_IndividualLayoutConstraint_GetRelationship, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_SetRelationship", (PyCFunction) _wrap_IndividualLayoutConstraint_SetRelationship, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_ResetIfWin", (PyCFunction) _wrap_IndividualLayoutConstraint_ResetIfWin, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_SatisfyConstraint", (PyCFunction) _wrap_IndividualLayoutConstraint_SatisfyConstraint, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_GetEdge", (PyCFunction) _wrap_IndividualLayoutConstraint_GetEdge, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"IndividualLayoutConstraint_swigregister", IndividualLayoutConstraint_swigregister, METH_VARARGS, NULL},
+        { (char *)"LayoutConstraints_left_get", (PyCFunction) _wrap_LayoutConstraints_left_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"LayoutConstraints_top_get", (PyCFunction) _wrap_LayoutConstraints_top_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"LayoutConstraints_right_get", (PyCFunction) _wrap_LayoutConstraints_right_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"LayoutConstraints_bottom_get", (PyCFunction) _wrap_LayoutConstraints_bottom_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"LayoutConstraints_width_get", (PyCFunction) _wrap_LayoutConstraints_width_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"LayoutConstraints_height_get", (PyCFunction) _wrap_LayoutConstraints_height_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"LayoutConstraints_centreX_get", (PyCFunction) _wrap_LayoutConstraints_centreX_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"LayoutConstraints_centreY_get", (PyCFunction) _wrap_LayoutConstraints_centreY_get, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"new_LayoutConstraints", (PyCFunction) _wrap_new_LayoutConstraints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"LayoutConstraints_SatisfyConstraints", (PyCFunction) _wrap_LayoutConstraints_SatisfyConstraints, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"LayoutConstraints_AreSatisfied", (PyCFunction) _wrap_LayoutConstraints_AreSatisfied, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"LayoutConstraints_swigregister", LayoutConstraints_swigregister, METH_VARARGS, NULL},
         { NULL, NULL, 0, NULL }
 };
 
@@ -47170,7 +47344,7 @@ static swig_type_info _swigt__unsigned_int[] = {{"_unsigned_int", 0, "unsigned i
 static swig_type_info _swigt__p_unsigned_int[] = {{"_p_unsigned_int", 0, "unsigned int *|time_t *", 0, 0, 0, 0},{"_p_unsigned_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxMenuEvent[] = {{"_p_wxMenuEvent", 0, "wxMenuEvent *", 0, 0, 0, 0},{"_p_wxMenuEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxContextMenuEvent[] = {{"_p_wxContextMenuEvent", 0, "wxContextMenuEvent *", 0, 0, 0, 0},{"_p_wxContextMenuEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *|byte *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxEraseEvent[] = {{"_p_wxEraseEvent", 0, "wxEraseEvent *", 0, 0, 0, 0},{"_p_wxEraseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxMouseEvent[] = {{"_p_wxMouseEvent", 0, "wxMouseEvent *", 0, 0, 0, 0},{"_p_wxMouseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxCloseEvent[] = {{"_p_wxCloseEvent", 0, "wxCloseEvent *", 0, 0, 0, 0},{"_p_wxCloseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -47676,979 +47850,991 @@ SWIGEXPORT(void) SWIG_init(void) {
 #endif
     
     {
-        PyDict_SetItemString(d,"wxNOT_FOUND", SWIG_From_int((int)(wxNOT_FOUND))); 
+        PyDict_SetItemString(d,"NOT_FOUND", SWIG_From_int((int)(wxNOT_FOUND))); 
+    }
+    {
+        PyDict_SetItemString(d,"VSCROLL", SWIG_From_int((int)(wxVSCROLL))); 
+    }
+    {
+        PyDict_SetItemString(d,"HSCROLL", SWIG_From_int((int)(wxHSCROLL))); 
     }
     {
-        PyDict_SetItemString(d,"wxVSCROLL", SWIG_From_int((int)(wxVSCROLL))); 
+        PyDict_SetItemString(d,"CAPTION", SWIG_From_int((int)(wxCAPTION))); 
     }
     {
-        PyDict_SetItemString(d,"wxHSCROLL", SWIG_From_int((int)(wxHSCROLL))); 
+        PyDict_SetItemString(d,"DOUBLE_BORDER", SWIG_From_int((int)(wxDOUBLE_BORDER))); 
     }
     {
-        PyDict_SetItemString(d,"wxCAPTION", SWIG_From_int((int)(wxCAPTION))); 
+        PyDict_SetItemString(d,"SUNKEN_BORDER", SWIG_From_int((int)(wxSUNKEN_BORDER))); 
     }
     {
-        PyDict_SetItemString(d,"wxDOUBLE_BORDER", SWIG_From_int((int)(wxDOUBLE_BORDER))); 
+        PyDict_SetItemString(d,"RAISED_BORDER", SWIG_From_int((int)(wxRAISED_BORDER))); 
     }
     {
-        PyDict_SetItemString(d,"wxSUNKEN_BORDER", SWIG_From_int((int)(wxSUNKEN_BORDER))); 
+        PyDict_SetItemString(d,"BORDER", SWIG_From_int((int)(wxBORDER))); 
     }
     {
-        PyDict_SetItemString(d,"wxRAISED_BORDER", SWIG_From_int((int)(wxRAISED_BORDER))); 
+        PyDict_SetItemString(d,"SIMPLE_BORDER", SWIG_From_int((int)(wxSIMPLE_BORDER))); 
     }
     {
-        PyDict_SetItemString(d,"wxBORDER", SWIG_From_int((int)(wxBORDER))); 
+        PyDict_SetItemString(d,"STATIC_BORDER", SWIG_From_int((int)(wxSTATIC_BORDER))); 
     }
     {
-        PyDict_SetItemString(d,"wxSIMPLE_BORDER", SWIG_From_int((int)(wxSIMPLE_BORDER))); 
+        PyDict_SetItemString(d,"TRANSPARENT_WINDOW", SWIG_From_int((int)(wxTRANSPARENT_WINDOW))); 
     }
     {
-        PyDict_SetItemString(d,"wxSTATIC_BORDER", SWIG_From_int((int)(wxSTATIC_BORDER))); 
+        PyDict_SetItemString(d,"NO_BORDER", SWIG_From_int((int)(wxNO_BORDER))); 
     }
     {
-        PyDict_SetItemString(d,"wxTRANSPARENT_WINDOW", SWIG_From_int((int)(wxTRANSPARENT_WINDOW))); 
+        PyDict_SetItemString(d,"DEFAULT_CONTROL_BORDER", SWIG_From_int((int)(wxDEFAULT_CONTROL_BORDER))); 
     }
     {
-        PyDict_SetItemString(d,"wxNO_BORDER", SWIG_From_int((int)(wxNO_BORDER))); 
+        PyDict_SetItemString(d,"DEFAULT_STATUSBAR_STYLE", SWIG_From_int((int)(wxDEFAULT_STATUSBAR_STYLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxTAB_TRAVERSAL", SWIG_From_int((int)(wxTAB_TRAVERSAL))); 
+        PyDict_SetItemString(d,"TAB_TRAVERSAL", SWIG_From_int((int)(wxTAB_TRAVERSAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxWANTS_CHARS", SWIG_From_int((int)(wxWANTS_CHARS))); 
+        PyDict_SetItemString(d,"WANTS_CHARS", SWIG_From_int((int)(wxWANTS_CHARS))); 
     }
     {
-        PyDict_SetItemString(d,"wxPOPUP_WINDOW", SWIG_From_int((int)(wxPOPUP_WINDOW))); 
+        PyDict_SetItemString(d,"POPUP_WINDOW", SWIG_From_int((int)(wxPOPUP_WINDOW))); 
     }
     {
-        PyDict_SetItemString(d,"wxCENTER_FRAME", SWIG_From_int((int)(wxCENTER_FRAME))); 
+        PyDict_SetItemString(d,"CENTER_FRAME", SWIG_From_int((int)(wxCENTER_FRAME))); 
     }
     {
-        PyDict_SetItemString(d,"wxCENTRE_ON_SCREEN", SWIG_From_int((int)(wxCENTRE_ON_SCREEN))); 
+        PyDict_SetItemString(d,"CENTRE_ON_SCREEN", SWIG_From_int((int)(wxCENTRE_ON_SCREEN))); 
     }
     {
-        PyDict_SetItemString(d,"wxCENTER_ON_SCREEN", SWIG_From_int((int)(wxCENTER_ON_SCREEN))); 
+        PyDict_SetItemString(d,"CENTER_ON_SCREEN", SWIG_From_int((int)(wxCENTER_ON_SCREEN))); 
     }
     {
-        PyDict_SetItemString(d,"wxCLIP_CHILDREN", SWIG_From_int((int)(wxCLIP_CHILDREN))); 
+        PyDict_SetItemString(d,"CLIP_CHILDREN", SWIG_From_int((int)(wxCLIP_CHILDREN))); 
     }
     {
-        PyDict_SetItemString(d,"wxCLIP_SIBLINGS", SWIG_From_int((int)(wxCLIP_SIBLINGS))); 
+        PyDict_SetItemString(d,"CLIP_SIBLINGS", SWIG_From_int((int)(wxCLIP_SIBLINGS))); 
     }
     {
-        PyDict_SetItemString(d,"wxALWAYS_SHOW_SB", SWIG_From_int((int)(wxALWAYS_SHOW_SB))); 
+        PyDict_SetItemString(d,"ALWAYS_SHOW_SB", SWIG_From_int((int)(wxALWAYS_SHOW_SB))); 
     }
     {
-        PyDict_SetItemString(d,"wxRETAINED", SWIG_From_int((int)(wxRETAINED))); 
+        PyDict_SetItemString(d,"RETAINED", SWIG_From_int((int)(wxRETAINED))); 
     }
     {
-        PyDict_SetItemString(d,"wxBACKINGSTORE", SWIG_From_int((int)(wxBACKINGSTORE))); 
+        PyDict_SetItemString(d,"BACKINGSTORE", SWIG_From_int((int)(wxBACKINGSTORE))); 
     }
     {
-        PyDict_SetItemString(d,"wxCOLOURED", SWIG_From_int((int)(wxCOLOURED))); 
+        PyDict_SetItemString(d,"COLOURED", SWIG_From_int((int)(wxCOLOURED))); 
     }
     {
-        PyDict_SetItemString(d,"wxFIXED_LENGTH", SWIG_From_int((int)(wxFIXED_LENGTH))); 
+        PyDict_SetItemString(d,"FIXED_LENGTH", SWIG_From_int((int)(wxFIXED_LENGTH))); 
     }
     {
-        PyDict_SetItemString(d,"wxLB_NEEDED_SB", SWIG_From_int((int)(wxLB_NEEDED_SB))); 
+        PyDict_SetItemString(d,"LB_NEEDED_SB", SWIG_From_int((int)(wxLB_NEEDED_SB))); 
     }
     {
-        PyDict_SetItemString(d,"wxLB_ALWAYS_SB", SWIG_From_int((int)(wxLB_ALWAYS_SB))); 
+        PyDict_SetItemString(d,"LB_ALWAYS_SB", SWIG_From_int((int)(wxLB_ALWAYS_SB))); 
     }
     {
-        PyDict_SetItemString(d,"wxLB_SORT", SWIG_From_int((int)(wxLB_SORT))); 
+        PyDict_SetItemString(d,"LB_SORT", SWIG_From_int((int)(wxLB_SORT))); 
     }
     {
-        PyDict_SetItemString(d,"wxLB_SINGLE", SWIG_From_int((int)(wxLB_SINGLE))); 
+        PyDict_SetItemString(d,"LB_SINGLE", SWIG_From_int((int)(wxLB_SINGLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxLB_MULTIPLE", SWIG_From_int((int)(wxLB_MULTIPLE))); 
+        PyDict_SetItemString(d,"LB_MULTIPLE", SWIG_From_int((int)(wxLB_MULTIPLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxLB_EXTENDED", SWIG_From_int((int)(wxLB_EXTENDED))); 
+        PyDict_SetItemString(d,"LB_EXTENDED", SWIG_From_int((int)(wxLB_EXTENDED))); 
     }
     {
-        PyDict_SetItemString(d,"wxLB_OWNERDRAW", SWIG_From_int((int)(wxLB_OWNERDRAW))); 
+        PyDict_SetItemString(d,"LB_OWNERDRAW", SWIG_From_int((int)(wxLB_OWNERDRAW))); 
     }
     {
-        PyDict_SetItemString(d,"wxLB_HSCROLL", SWIG_From_int((int)(wxLB_HSCROLL))); 
+        PyDict_SetItemString(d,"LB_HSCROLL", SWIG_From_int((int)(wxLB_HSCROLL))); 
     }
     {
-        PyDict_SetItemString(d,"wxPROCESS_ENTER", SWIG_From_int((int)(wxPROCESS_ENTER))); 
+        PyDict_SetItemString(d,"PROCESS_ENTER", SWIG_From_int((int)(wxPROCESS_ENTER))); 
     }
     {
-        PyDict_SetItemString(d,"wxPASSWORD", SWIG_From_int((int)(wxPASSWORD))); 
+        PyDict_SetItemString(d,"PASSWORD", SWIG_From_int((int)(wxPASSWORD))); 
     }
     {
-        PyDict_SetItemString(d,"wxCB_SIMPLE", SWIG_From_int((int)(wxCB_SIMPLE))); 
+        PyDict_SetItemString(d,"CB_SIMPLE", SWIG_From_int((int)(wxCB_SIMPLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxCB_DROPDOWN", SWIG_From_int((int)(wxCB_DROPDOWN))); 
+        PyDict_SetItemString(d,"CB_DROPDOWN", SWIG_From_int((int)(wxCB_DROPDOWN))); 
     }
     {
-        PyDict_SetItemString(d,"wxCB_SORT", SWIG_From_int((int)(wxCB_SORT))); 
+        PyDict_SetItemString(d,"CB_SORT", SWIG_From_int((int)(wxCB_SORT))); 
     }
     {
-        PyDict_SetItemString(d,"wxCB_READONLY", SWIG_From_int((int)(wxCB_READONLY))); 
+        PyDict_SetItemString(d,"CB_READONLY", SWIG_From_int((int)(wxCB_READONLY))); 
     }
     {
-        PyDict_SetItemString(d,"wxRA_HORIZONTAL", SWIG_From_int((int)(wxRA_HORIZONTAL))); 
+        PyDict_SetItemString(d,"RA_HORIZONTAL", SWIG_From_int((int)(wxRA_HORIZONTAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxRA_VERTICAL", SWIG_From_int((int)(wxRA_VERTICAL))); 
+        PyDict_SetItemString(d,"RA_VERTICAL", SWIG_From_int((int)(wxRA_VERTICAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxRA_SPECIFY_ROWS", SWIG_From_int((int)(wxRA_SPECIFY_ROWS))); 
+        PyDict_SetItemString(d,"RA_SPECIFY_ROWS", SWIG_From_int((int)(wxRA_SPECIFY_ROWS))); 
     }
     {
-        PyDict_SetItemString(d,"wxRA_SPECIFY_COLS", SWIG_From_int((int)(wxRA_SPECIFY_COLS))); 
+        PyDict_SetItemString(d,"RA_SPECIFY_COLS", SWIG_From_int((int)(wxRA_SPECIFY_COLS))); 
     }
     {
-        PyDict_SetItemString(d,"wxRA_USE_CHECKBOX", SWIG_From_int((int)(wxRA_USE_CHECKBOX))); 
+        PyDict_SetItemString(d,"RA_USE_CHECKBOX", SWIG_From_int((int)(wxRA_USE_CHECKBOX))); 
     }
     {
-        PyDict_SetItemString(d,"wxRB_GROUP", SWIG_From_int((int)(wxRB_GROUP))); 
+        PyDict_SetItemString(d,"RB_GROUP", SWIG_From_int((int)(wxRB_GROUP))); 
     }
     {
-        PyDict_SetItemString(d,"wxRB_SINGLE", SWIG_From_int((int)(wxRB_SINGLE))); 
+        PyDict_SetItemString(d,"RB_SINGLE", SWIG_From_int((int)(wxRB_SINGLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxSB_HORIZONTAL", SWIG_From_int((int)(wxSB_HORIZONTAL))); 
+        PyDict_SetItemString(d,"SB_HORIZONTAL", SWIG_From_int((int)(wxSB_HORIZONTAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxSB_VERTICAL", SWIG_From_int((int)(wxSB_VERTICAL))); 
+        PyDict_SetItemString(d,"SB_VERTICAL", SWIG_From_int((int)(wxSB_VERTICAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxRB_USE_CHECKBOX", SWIG_From_int((int)(wxRB_USE_CHECKBOX))); 
+        PyDict_SetItemString(d,"RB_USE_CHECKBOX", SWIG_From_int((int)(wxRB_USE_CHECKBOX))); 
     }
     {
-        PyDict_SetItemString(d,"wxST_SIZEGRIP", SWIG_From_int((int)(wxST_SIZEGRIP))); 
+        PyDict_SetItemString(d,"ST_SIZEGRIP", SWIG_From_int((int)(wxST_SIZEGRIP))); 
     }
     {
-        PyDict_SetItemString(d,"wxST_NO_AUTORESIZE", SWIG_From_int((int)(wxST_NO_AUTORESIZE))); 
+        PyDict_SetItemString(d,"ST_NO_AUTORESIZE", SWIG_From_int((int)(wxST_NO_AUTORESIZE))); 
     }
     {
-        PyDict_SetItemString(d,"wxFLOOD_SURFACE", SWIG_From_int((int)(wxFLOOD_SURFACE))); 
+        PyDict_SetItemString(d,"FLOOD_SURFACE", SWIG_From_int((int)(wxFLOOD_SURFACE))); 
     }
     {
-        PyDict_SetItemString(d,"wxFLOOD_BORDER", SWIG_From_int((int)(wxFLOOD_BORDER))); 
+        PyDict_SetItemString(d,"FLOOD_BORDER", SWIG_From_int((int)(wxFLOOD_BORDER))); 
     }
     {
-        PyDict_SetItemString(d,"wxODDEVEN_RULE", SWIG_From_int((int)(wxODDEVEN_RULE))); 
+        PyDict_SetItemString(d,"ODDEVEN_RULE", SWIG_From_int((int)(wxODDEVEN_RULE))); 
     }
     {
-        PyDict_SetItemString(d,"wxWINDING_RULE", SWIG_From_int((int)(wxWINDING_RULE))); 
+        PyDict_SetItemString(d,"WINDING_RULE", SWIG_From_int((int)(wxWINDING_RULE))); 
     }
     {
-        PyDict_SetItemString(d,"wxTOOL_TOP", SWIG_From_int((int)(wxTOOL_TOP))); 
+        PyDict_SetItemString(d,"TOOL_TOP", SWIG_From_int((int)(wxTOOL_TOP))); 
     }
     {
-        PyDict_SetItemString(d,"wxTOOL_BOTTOM", SWIG_From_int((int)(wxTOOL_BOTTOM))); 
+        PyDict_SetItemString(d,"TOOL_BOTTOM", SWIG_From_int((int)(wxTOOL_BOTTOM))); 
     }
     {
-        PyDict_SetItemString(d,"wxTOOL_LEFT", SWIG_From_int((int)(wxTOOL_LEFT))); 
+        PyDict_SetItemString(d,"TOOL_LEFT", SWIG_From_int((int)(wxTOOL_LEFT))); 
     }
     {
-        PyDict_SetItemString(d,"wxTOOL_RIGHT", SWIG_From_int((int)(wxTOOL_RIGHT))); 
+        PyDict_SetItemString(d,"TOOL_RIGHT", SWIG_From_int((int)(wxTOOL_RIGHT))); 
     }
     {
-        PyDict_SetItemString(d,"wxOK", SWIG_From_int((int)(wxOK))); 
+        PyDict_SetItemString(d,"OK", SWIG_From_int((int)(wxOK))); 
     }
     {
-        PyDict_SetItemString(d,"wxYES_NO", SWIG_From_int((int)(wxYES_NO))); 
+        PyDict_SetItemString(d,"YES_NO", SWIG_From_int((int)(wxYES_NO))); 
     }
     {
-        PyDict_SetItemString(d,"wxCANCEL", SWIG_From_int((int)(wxCANCEL))); 
+        PyDict_SetItemString(d,"CANCEL", SWIG_From_int((int)(wxCANCEL))); 
     }
     {
-        PyDict_SetItemString(d,"wxYES", SWIG_From_int((int)(wxYES))); 
+        PyDict_SetItemString(d,"YES", SWIG_From_int((int)(wxYES))); 
     }
     {
-        PyDict_SetItemString(d,"wxNO", SWIG_From_int((int)(wxNO))); 
+        PyDict_SetItemString(d,"NO", SWIG_From_int((int)(wxNO))); 
     }
     {
-        PyDict_SetItemString(d,"wxNO_DEFAULT", SWIG_From_int((int)(wxNO_DEFAULT))); 
+        PyDict_SetItemString(d,"NO_DEFAULT", SWIG_From_int((int)(wxNO_DEFAULT))); 
     }
     {
-        PyDict_SetItemString(d,"wxYES_DEFAULT", SWIG_From_int((int)(wxYES_DEFAULT))); 
+        PyDict_SetItemString(d,"YES_DEFAULT", SWIG_From_int((int)(wxYES_DEFAULT))); 
     }
     {
-        PyDict_SetItemString(d,"wxICON_EXCLAMATION", SWIG_From_int((int)(wxICON_EXCLAMATION))); 
+        PyDict_SetItemString(d,"ICON_EXCLAMATION", SWIG_From_int((int)(wxICON_EXCLAMATION))); 
     }
     {
-        PyDict_SetItemString(d,"wxICON_HAND", SWIG_From_int((int)(wxICON_HAND))); 
+        PyDict_SetItemString(d,"ICON_HAND", SWIG_From_int((int)(wxICON_HAND))); 
     }
     {
-        PyDict_SetItemString(d,"wxICON_QUESTION", SWIG_From_int((int)(wxICON_QUESTION))); 
+        PyDict_SetItemString(d,"ICON_QUESTION", SWIG_From_int((int)(wxICON_QUESTION))); 
     }
     {
-        PyDict_SetItemString(d,"wxICON_INFORMATION", SWIG_From_int((int)(wxICON_INFORMATION))); 
+        PyDict_SetItemString(d,"ICON_INFORMATION", SWIG_From_int((int)(wxICON_INFORMATION))); 
     }
     {
-        PyDict_SetItemString(d,"wxICON_STOP", SWIG_From_int((int)(wxICON_STOP))); 
+        PyDict_SetItemString(d,"ICON_STOP", SWIG_From_int((int)(wxICON_STOP))); 
     }
     {
-        PyDict_SetItemString(d,"wxICON_ASTERISK", SWIG_From_int((int)(wxICON_ASTERISK))); 
+        PyDict_SetItemString(d,"ICON_ASTERISK", SWIG_From_int((int)(wxICON_ASTERISK))); 
     }
     {
-        PyDict_SetItemString(d,"wxICON_MASK", SWIG_From_int((int)(wxICON_MASK))); 
+        PyDict_SetItemString(d,"ICON_MASK", SWIG_From_int((int)(wxICON_MASK))); 
     }
     {
-        PyDict_SetItemString(d,"wxICON_WARNING", SWIG_From_int((int)(wxICON_WARNING))); 
+        PyDict_SetItemString(d,"ICON_WARNING", SWIG_From_int((int)(wxICON_WARNING))); 
     }
     {
-        PyDict_SetItemString(d,"wxICON_ERROR", SWIG_From_int((int)(wxICON_ERROR))); 
+        PyDict_SetItemString(d,"ICON_ERROR", SWIG_From_int((int)(wxICON_ERROR))); 
     }
     {
-        PyDict_SetItemString(d,"wxFORWARD", SWIG_From_int((int)(wxFORWARD))); 
+        PyDict_SetItemString(d,"FORWARD", SWIG_From_int((int)(wxFORWARD))); 
     }
     {
-        PyDict_SetItemString(d,"wxBACKWARD", SWIG_From_int((int)(wxBACKWARD))); 
+        PyDict_SetItemString(d,"BACKWARD", SWIG_From_int((int)(wxBACKWARD))); 
     }
     {
-        PyDict_SetItemString(d,"wxRESET", SWIG_From_int((int)(wxRESET))); 
+        PyDict_SetItemString(d,"RESET", SWIG_From_int((int)(wxRESET))); 
     }
     {
-        PyDict_SetItemString(d,"wxHELP", SWIG_From_int((int)(wxHELP))); 
+        PyDict_SetItemString(d,"HELP", SWIG_From_int((int)(wxHELP))); 
     }
     {
-        PyDict_SetItemString(d,"wxMORE", SWIG_From_int((int)(wxMORE))); 
+        PyDict_SetItemString(d,"MORE", SWIG_From_int((int)(wxMORE))); 
     }
     {
-        PyDict_SetItemString(d,"wxSETUP", SWIG_From_int((int)(wxSETUP))); 
+        PyDict_SetItemString(d,"SETUP", SWIG_From_int((int)(wxSETUP))); 
     }
     {
-        PyDict_SetItemString(d,"wxSIZE_AUTO_WIDTH", SWIG_From_int((int)(wxSIZE_AUTO_WIDTH))); 
+        PyDict_SetItemString(d,"SIZE_AUTO_WIDTH", SWIG_From_int((int)(wxSIZE_AUTO_WIDTH))); 
     }
     {
-        PyDict_SetItemString(d,"wxSIZE_AUTO_HEIGHT", SWIG_From_int((int)(wxSIZE_AUTO_HEIGHT))); 
+        PyDict_SetItemString(d,"SIZE_AUTO_HEIGHT", SWIG_From_int((int)(wxSIZE_AUTO_HEIGHT))); 
     }
     {
-        PyDict_SetItemString(d,"wxSIZE_AUTO", SWIG_From_int((int)(wxSIZE_AUTO))); 
+        PyDict_SetItemString(d,"SIZE_AUTO", SWIG_From_int((int)(wxSIZE_AUTO))); 
     }
     {
-        PyDict_SetItemString(d,"wxSIZE_USE_EXISTING", SWIG_From_int((int)(wxSIZE_USE_EXISTING))); 
+        PyDict_SetItemString(d,"SIZE_USE_EXISTING", SWIG_From_int((int)(wxSIZE_USE_EXISTING))); 
     }
     {
-        PyDict_SetItemString(d,"wxSIZE_ALLOW_MINUS_ONE", SWIG_From_int((int)(wxSIZE_ALLOW_MINUS_ONE))); 
+        PyDict_SetItemString(d,"SIZE_ALLOW_MINUS_ONE", SWIG_From_int((int)(wxSIZE_ALLOW_MINUS_ONE))); 
     }
     {
-        PyDict_SetItemString(d,"wxPORTRAIT", SWIG_From_int((int)(wxPORTRAIT))); 
+        PyDict_SetItemString(d,"PORTRAIT", SWIG_From_int((int)(wxPORTRAIT))); 
     }
     {
-        PyDict_SetItemString(d,"wxLANDSCAPE", SWIG_From_int((int)(wxLANDSCAPE))); 
+        PyDict_SetItemString(d,"LANDSCAPE", SWIG_From_int((int)(wxLANDSCAPE))); 
     }
     {
-        PyDict_SetItemString(d,"wxPRINT_QUALITY_HIGH", SWIG_From_int((int)(wxPRINT_QUALITY_HIGH))); 
+        PyDict_SetItemString(d,"PRINT_QUALITY_HIGH", SWIG_From_int((int)(wxPRINT_QUALITY_HIGH))); 
     }
     {
-        PyDict_SetItemString(d,"wxPRINT_QUALITY_MEDIUM", SWIG_From_int((int)(wxPRINT_QUALITY_MEDIUM))); 
+        PyDict_SetItemString(d,"PRINT_QUALITY_MEDIUM", SWIG_From_int((int)(wxPRINT_QUALITY_MEDIUM))); 
     }
     {
-        PyDict_SetItemString(d,"wxPRINT_QUALITY_LOW", SWIG_From_int((int)(wxPRINT_QUALITY_LOW))); 
+        PyDict_SetItemString(d,"PRINT_QUALITY_LOW", SWIG_From_int((int)(wxPRINT_QUALITY_LOW))); 
     }
     {
-        PyDict_SetItemString(d,"wxPRINT_QUALITY_DRAFT", SWIG_From_int((int)(wxPRINT_QUALITY_DRAFT))); 
+        PyDict_SetItemString(d,"PRINT_QUALITY_DRAFT", SWIG_From_int((int)(wxPRINT_QUALITY_DRAFT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_ANY", SWIG_From_int((int)(wxID_ANY))); 
+        PyDict_SetItemString(d,"ID_ANY", SWIG_From_int((int)(wxID_ANY))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_SEPARATOR", SWIG_From_int((int)(wxID_SEPARATOR))); 
+        PyDict_SetItemString(d,"ID_SEPARATOR", SWIG_From_int((int)(wxID_SEPARATOR))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_LOWEST", SWIG_From_int((int)(wxID_LOWEST))); 
+        PyDict_SetItemString(d,"ID_LOWEST", SWIG_From_int((int)(wxID_LOWEST))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_OPEN", SWIG_From_int((int)(wxID_OPEN))); 
+        PyDict_SetItemString(d,"ID_OPEN", SWIG_From_int((int)(wxID_OPEN))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_CLOSE", SWIG_From_int((int)(wxID_CLOSE))); 
+        PyDict_SetItemString(d,"ID_CLOSE", SWIG_From_int((int)(wxID_CLOSE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_NEW", SWIG_From_int((int)(wxID_NEW))); 
+        PyDict_SetItemString(d,"ID_NEW", SWIG_From_int((int)(wxID_NEW))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_SAVE", SWIG_From_int((int)(wxID_SAVE))); 
+        PyDict_SetItemString(d,"ID_SAVE", SWIG_From_int((int)(wxID_SAVE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_SAVEAS", SWIG_From_int((int)(wxID_SAVEAS))); 
+        PyDict_SetItemString(d,"ID_SAVEAS", SWIG_From_int((int)(wxID_SAVEAS))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_REVERT", SWIG_From_int((int)(wxID_REVERT))); 
+        PyDict_SetItemString(d,"ID_REVERT", SWIG_From_int((int)(wxID_REVERT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_EXIT", SWIG_From_int((int)(wxID_EXIT))); 
+        PyDict_SetItemString(d,"ID_EXIT", SWIG_From_int((int)(wxID_EXIT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_UNDO", SWIG_From_int((int)(wxID_UNDO))); 
+        PyDict_SetItemString(d,"ID_UNDO", SWIG_From_int((int)(wxID_UNDO))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_REDO", SWIG_From_int((int)(wxID_REDO))); 
+        PyDict_SetItemString(d,"ID_REDO", SWIG_From_int((int)(wxID_REDO))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_HELP", SWIG_From_int((int)(wxID_HELP))); 
+        PyDict_SetItemString(d,"ID_HELP", SWIG_From_int((int)(wxID_HELP))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_PRINT", SWIG_From_int((int)(wxID_PRINT))); 
+        PyDict_SetItemString(d,"ID_PRINT", SWIG_From_int((int)(wxID_PRINT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_PRINT_SETUP", SWIG_From_int((int)(wxID_PRINT_SETUP))); 
+        PyDict_SetItemString(d,"ID_PRINT_SETUP", SWIG_From_int((int)(wxID_PRINT_SETUP))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_PREVIEW", SWIG_From_int((int)(wxID_PREVIEW))); 
+        PyDict_SetItemString(d,"ID_PREVIEW", SWIG_From_int((int)(wxID_PREVIEW))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_ABOUT", SWIG_From_int((int)(wxID_ABOUT))); 
+        PyDict_SetItemString(d,"ID_ABOUT", SWIG_From_int((int)(wxID_ABOUT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_HELP_CONTENTS", SWIG_From_int((int)(wxID_HELP_CONTENTS))); 
+        PyDict_SetItemString(d,"ID_HELP_CONTENTS", SWIG_From_int((int)(wxID_HELP_CONTENTS))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_HELP_COMMANDS", SWIG_From_int((int)(wxID_HELP_COMMANDS))); 
+        PyDict_SetItemString(d,"ID_HELP_COMMANDS", SWIG_From_int((int)(wxID_HELP_COMMANDS))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_HELP_PROCEDURES", SWIG_From_int((int)(wxID_HELP_PROCEDURES))); 
+        PyDict_SetItemString(d,"ID_HELP_PROCEDURES", SWIG_From_int((int)(wxID_HELP_PROCEDURES))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_HELP_CONTEXT", SWIG_From_int((int)(wxID_HELP_CONTEXT))); 
+        PyDict_SetItemString(d,"ID_HELP_CONTEXT", SWIG_From_int((int)(wxID_HELP_CONTEXT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_CLOSE_ALL", SWIG_From_int((int)(wxID_CLOSE_ALL))); 
+        PyDict_SetItemString(d,"ID_CLOSE_ALL", SWIG_From_int((int)(wxID_CLOSE_ALL))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_PREFERENCES", SWIG_From_int((int)(wxID_PREFERENCES))); 
+        PyDict_SetItemString(d,"ID_PREFERENCES", SWIG_From_int((int)(wxID_PREFERENCES))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_CUT", SWIG_From_int((int)(wxID_CUT))); 
+        PyDict_SetItemString(d,"ID_CUT", SWIG_From_int((int)(wxID_CUT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_COPY", SWIG_From_int((int)(wxID_COPY))); 
+        PyDict_SetItemString(d,"ID_COPY", SWIG_From_int((int)(wxID_COPY))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_PASTE", SWIG_From_int((int)(wxID_PASTE))); 
+        PyDict_SetItemString(d,"ID_PASTE", SWIG_From_int((int)(wxID_PASTE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_CLEAR", SWIG_From_int((int)(wxID_CLEAR))); 
+        PyDict_SetItemString(d,"ID_CLEAR", SWIG_From_int((int)(wxID_CLEAR))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_FIND", SWIG_From_int((int)(wxID_FIND))); 
+        PyDict_SetItemString(d,"ID_FIND", SWIG_From_int((int)(wxID_FIND))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_DUPLICATE", SWIG_From_int((int)(wxID_DUPLICATE))); 
+        PyDict_SetItemString(d,"ID_DUPLICATE", SWIG_From_int((int)(wxID_DUPLICATE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_SELECTALL", SWIG_From_int((int)(wxID_SELECTALL))); 
+        PyDict_SetItemString(d,"ID_SELECTALL", SWIG_From_int((int)(wxID_SELECTALL))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_DELETE", SWIG_From_int((int)(wxID_DELETE))); 
+        PyDict_SetItemString(d,"ID_DELETE", SWIG_From_int((int)(wxID_DELETE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_REPLACE", SWIG_From_int((int)(wxID_REPLACE))); 
+        PyDict_SetItemString(d,"ID_REPLACE", SWIG_From_int((int)(wxID_REPLACE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_REPLACE_ALL", SWIG_From_int((int)(wxID_REPLACE_ALL))); 
+        PyDict_SetItemString(d,"ID_REPLACE_ALL", SWIG_From_int((int)(wxID_REPLACE_ALL))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_PROPERTIES", SWIG_From_int((int)(wxID_PROPERTIES))); 
+        PyDict_SetItemString(d,"ID_PROPERTIES", SWIG_From_int((int)(wxID_PROPERTIES))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_VIEW_DETAILS", SWIG_From_int((int)(wxID_VIEW_DETAILS))); 
+        PyDict_SetItemString(d,"ID_VIEW_DETAILS", SWIG_From_int((int)(wxID_VIEW_DETAILS))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_VIEW_LARGEICONS", SWIG_From_int((int)(wxID_VIEW_LARGEICONS))); 
+        PyDict_SetItemString(d,"ID_VIEW_LARGEICONS", SWIG_From_int((int)(wxID_VIEW_LARGEICONS))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_VIEW_SMALLICONS", SWIG_From_int((int)(wxID_VIEW_SMALLICONS))); 
+        PyDict_SetItemString(d,"ID_VIEW_SMALLICONS", SWIG_From_int((int)(wxID_VIEW_SMALLICONS))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_VIEW_LIST", SWIG_From_int((int)(wxID_VIEW_LIST))); 
+        PyDict_SetItemString(d,"ID_VIEW_LIST", SWIG_From_int((int)(wxID_VIEW_LIST))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_VIEW_SORTDATE", SWIG_From_int((int)(wxID_VIEW_SORTDATE))); 
+        PyDict_SetItemString(d,"ID_VIEW_SORTDATE", SWIG_From_int((int)(wxID_VIEW_SORTDATE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_VIEW_SORTNAME", SWIG_From_int((int)(wxID_VIEW_SORTNAME))); 
+        PyDict_SetItemString(d,"ID_VIEW_SORTNAME", SWIG_From_int((int)(wxID_VIEW_SORTNAME))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_VIEW_SORTSIZE", SWIG_From_int((int)(wxID_VIEW_SORTSIZE))); 
+        PyDict_SetItemString(d,"ID_VIEW_SORTSIZE", SWIG_From_int((int)(wxID_VIEW_SORTSIZE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_VIEW_SORTTYPE", SWIG_From_int((int)(wxID_VIEW_SORTTYPE))); 
+        PyDict_SetItemString(d,"ID_VIEW_SORTTYPE", SWIG_From_int((int)(wxID_VIEW_SORTTYPE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_FILE1", SWIG_From_int((int)(wxID_FILE1))); 
+        PyDict_SetItemString(d,"ID_FILE1", SWIG_From_int((int)(wxID_FILE1))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_FILE2", SWIG_From_int((int)(wxID_FILE2))); 
+        PyDict_SetItemString(d,"ID_FILE2", SWIG_From_int((int)(wxID_FILE2))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_FILE3", SWIG_From_int((int)(wxID_FILE3))); 
+        PyDict_SetItemString(d,"ID_FILE3", SWIG_From_int((int)(wxID_FILE3))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_FILE4", SWIG_From_int((int)(wxID_FILE4))); 
+        PyDict_SetItemString(d,"ID_FILE4", SWIG_From_int((int)(wxID_FILE4))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_FILE5", SWIG_From_int((int)(wxID_FILE5))); 
+        PyDict_SetItemString(d,"ID_FILE5", SWIG_From_int((int)(wxID_FILE5))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_FILE6", SWIG_From_int((int)(wxID_FILE6))); 
+        PyDict_SetItemString(d,"ID_FILE6", SWIG_From_int((int)(wxID_FILE6))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_FILE7", SWIG_From_int((int)(wxID_FILE7))); 
+        PyDict_SetItemString(d,"ID_FILE7", SWIG_From_int((int)(wxID_FILE7))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_FILE8", SWIG_From_int((int)(wxID_FILE8))); 
+        PyDict_SetItemString(d,"ID_FILE8", SWIG_From_int((int)(wxID_FILE8))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_FILE9", SWIG_From_int((int)(wxID_FILE9))); 
+        PyDict_SetItemString(d,"ID_FILE9", SWIG_From_int((int)(wxID_FILE9))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_OK", SWIG_From_int((int)(wxID_OK))); 
+        PyDict_SetItemString(d,"ID_OK", SWIG_From_int((int)(wxID_OK))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_CANCEL", SWIG_From_int((int)(wxID_CANCEL))); 
+        PyDict_SetItemString(d,"ID_CANCEL", SWIG_From_int((int)(wxID_CANCEL))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_APPLY", SWIG_From_int((int)(wxID_APPLY))); 
+        PyDict_SetItemString(d,"ID_APPLY", SWIG_From_int((int)(wxID_APPLY))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_YES", SWIG_From_int((int)(wxID_YES))); 
+        PyDict_SetItemString(d,"ID_YES", SWIG_From_int((int)(wxID_YES))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_NO", SWIG_From_int((int)(wxID_NO))); 
+        PyDict_SetItemString(d,"ID_NO", SWIG_From_int((int)(wxID_NO))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_STATIC", SWIG_From_int((int)(wxID_STATIC))); 
+        PyDict_SetItemString(d,"ID_STATIC", SWIG_From_int((int)(wxID_STATIC))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_FORWARD", SWIG_From_int((int)(wxID_FORWARD))); 
+        PyDict_SetItemString(d,"ID_FORWARD", SWIG_From_int((int)(wxID_FORWARD))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_BACKWARD", SWIG_From_int((int)(wxID_BACKWARD))); 
+        PyDict_SetItemString(d,"ID_BACKWARD", SWIG_From_int((int)(wxID_BACKWARD))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_DEFAULT", SWIG_From_int((int)(wxID_DEFAULT))); 
+        PyDict_SetItemString(d,"ID_DEFAULT", SWIG_From_int((int)(wxID_DEFAULT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_MORE", SWIG_From_int((int)(wxID_MORE))); 
+        PyDict_SetItemString(d,"ID_MORE", SWIG_From_int((int)(wxID_MORE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_SETUP", SWIG_From_int((int)(wxID_SETUP))); 
+        PyDict_SetItemString(d,"ID_SETUP", SWIG_From_int((int)(wxID_SETUP))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_RESET", SWIG_From_int((int)(wxID_RESET))); 
+        PyDict_SetItemString(d,"ID_RESET", SWIG_From_int((int)(wxID_RESET))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_CONTEXT_HELP", SWIG_From_int((int)(wxID_CONTEXT_HELP))); 
+        PyDict_SetItemString(d,"ID_CONTEXT_HELP", SWIG_From_int((int)(wxID_CONTEXT_HELP))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_YESTOALL", SWIG_From_int((int)(wxID_YESTOALL))); 
+        PyDict_SetItemString(d,"ID_YESTOALL", SWIG_From_int((int)(wxID_YESTOALL))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_NOTOALL", SWIG_From_int((int)(wxID_NOTOALL))); 
+        PyDict_SetItemString(d,"ID_NOTOALL", SWIG_From_int((int)(wxID_NOTOALL))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_ABORT", SWIG_From_int((int)(wxID_ABORT))); 
+        PyDict_SetItemString(d,"ID_ABORT", SWIG_From_int((int)(wxID_ABORT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_RETRY", SWIG_From_int((int)(wxID_RETRY))); 
+        PyDict_SetItemString(d,"ID_RETRY", SWIG_From_int((int)(wxID_RETRY))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_IGNORE", SWIG_From_int((int)(wxID_IGNORE))); 
+        PyDict_SetItemString(d,"ID_IGNORE", SWIG_From_int((int)(wxID_IGNORE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_ADD", SWIG_From_int((int)(wxID_ADD))); 
+        PyDict_SetItemString(d,"ID_ADD", SWIG_From_int((int)(wxID_ADD))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_REMOVE", SWIG_From_int((int)(wxID_REMOVE))); 
+        PyDict_SetItemString(d,"ID_REMOVE", SWIG_From_int((int)(wxID_REMOVE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_UP", SWIG_From_int((int)(wxID_UP))); 
+        PyDict_SetItemString(d,"ID_UP", SWIG_From_int((int)(wxID_UP))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_DOWN", SWIG_From_int((int)(wxID_DOWN))); 
+        PyDict_SetItemString(d,"ID_DOWN", SWIG_From_int((int)(wxID_DOWN))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_HOME", SWIG_From_int((int)(wxID_HOME))); 
+        PyDict_SetItemString(d,"ID_HOME", SWIG_From_int((int)(wxID_HOME))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_REFRESH", SWIG_From_int((int)(wxID_REFRESH))); 
+        PyDict_SetItemString(d,"ID_REFRESH", SWIG_From_int((int)(wxID_REFRESH))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_STOP", SWIG_From_int((int)(wxID_STOP))); 
+        PyDict_SetItemString(d,"ID_STOP", SWIG_From_int((int)(wxID_STOP))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_INDEX", SWIG_From_int((int)(wxID_INDEX))); 
+        PyDict_SetItemString(d,"ID_INDEX", SWIG_From_int((int)(wxID_INDEX))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_BOLD", SWIG_From_int((int)(wxID_BOLD))); 
+        PyDict_SetItemString(d,"ID_BOLD", SWIG_From_int((int)(wxID_BOLD))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_ITALIC", SWIG_From_int((int)(wxID_ITALIC))); 
+        PyDict_SetItemString(d,"ID_ITALIC", SWIG_From_int((int)(wxID_ITALIC))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_JUSTIFY_CENTER", SWIG_From_int((int)(wxID_JUSTIFY_CENTER))); 
+        PyDict_SetItemString(d,"ID_JUSTIFY_CENTER", SWIG_From_int((int)(wxID_JUSTIFY_CENTER))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_JUSTIFY_FILL", SWIG_From_int((int)(wxID_JUSTIFY_FILL))); 
+        PyDict_SetItemString(d,"ID_JUSTIFY_FILL", SWIG_From_int((int)(wxID_JUSTIFY_FILL))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_JUSTIFY_RIGHT", SWIG_From_int((int)(wxID_JUSTIFY_RIGHT))); 
+        PyDict_SetItemString(d,"ID_JUSTIFY_RIGHT", SWIG_From_int((int)(wxID_JUSTIFY_RIGHT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_JUSTIFY_LEFT", SWIG_From_int((int)(wxID_JUSTIFY_LEFT))); 
+        PyDict_SetItemString(d,"ID_JUSTIFY_LEFT", SWIG_From_int((int)(wxID_JUSTIFY_LEFT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_UNDERLINE", SWIG_From_int((int)(wxID_UNDERLINE))); 
+        PyDict_SetItemString(d,"ID_UNDERLINE", SWIG_From_int((int)(wxID_UNDERLINE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_INDENT", SWIG_From_int((int)(wxID_INDENT))); 
+        PyDict_SetItemString(d,"ID_INDENT", SWIG_From_int((int)(wxID_INDENT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_UNINDENT", SWIG_From_int((int)(wxID_UNINDENT))); 
+        PyDict_SetItemString(d,"ID_UNINDENT", SWIG_From_int((int)(wxID_UNINDENT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_ZOOM_100", SWIG_From_int((int)(wxID_ZOOM_100))); 
+        PyDict_SetItemString(d,"ID_ZOOM_100", SWIG_From_int((int)(wxID_ZOOM_100))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_ZOOM_FIT", SWIG_From_int((int)(wxID_ZOOM_FIT))); 
+        PyDict_SetItemString(d,"ID_ZOOM_FIT", SWIG_From_int((int)(wxID_ZOOM_FIT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_ZOOM_IN", SWIG_From_int((int)(wxID_ZOOM_IN))); 
+        PyDict_SetItemString(d,"ID_ZOOM_IN", SWIG_From_int((int)(wxID_ZOOM_IN))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_ZOOM_OUT", SWIG_From_int((int)(wxID_ZOOM_OUT))); 
+        PyDict_SetItemString(d,"ID_ZOOM_OUT", SWIG_From_int((int)(wxID_ZOOM_OUT))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_UNDELETE", SWIG_From_int((int)(wxID_UNDELETE))); 
+        PyDict_SetItemString(d,"ID_UNDELETE", SWIG_From_int((int)(wxID_UNDELETE))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_REVERT_TO_SAVED", SWIG_From_int((int)(wxID_REVERT_TO_SAVED))); 
+        PyDict_SetItemString(d,"ID_REVERT_TO_SAVED", SWIG_From_int((int)(wxID_REVERT_TO_SAVED))); 
     }
     {
-        PyDict_SetItemString(d,"wxID_HIGHEST", SWIG_From_int((int)(wxID_HIGHEST))); 
+        PyDict_SetItemString(d,"ID_HIGHEST", SWIG_From_int((int)(wxID_HIGHEST))); 
     }
     {
-        PyDict_SetItemString(d,"wxOPEN", SWIG_From_int((int)(wxOPEN))); 
+        PyDict_SetItemString(d,"OPEN", SWIG_From_int((int)(wxOPEN))); 
     }
     {
-        PyDict_SetItemString(d,"wxSAVE", SWIG_From_int((int)(wxSAVE))); 
+        PyDict_SetItemString(d,"SAVE", SWIG_From_int((int)(wxSAVE))); 
     }
     {
-        PyDict_SetItemString(d,"wxHIDE_READONLY", SWIG_From_int((int)(wxHIDE_READONLY))); 
+        PyDict_SetItemString(d,"HIDE_READONLY", SWIG_From_int((int)(wxHIDE_READONLY))); 
     }
     {
-        PyDict_SetItemString(d,"wxOVERWRITE_PROMPT", SWIG_From_int((int)(wxOVERWRITE_PROMPT))); 
+        PyDict_SetItemString(d,"OVERWRITE_PROMPT", SWIG_From_int((int)(wxOVERWRITE_PROMPT))); 
     }
     {
-        PyDict_SetItemString(d,"wxFILE_MUST_EXIST", SWIG_From_int((int)(wxFILE_MUST_EXIST))); 
+        PyDict_SetItemString(d,"FILE_MUST_EXIST", SWIG_From_int((int)(wxFILE_MUST_EXIST))); 
     }
     {
-        PyDict_SetItemString(d,"wxMULTIPLE", SWIG_From_int((int)(wxMULTIPLE))); 
+        PyDict_SetItemString(d,"MULTIPLE", SWIG_From_int((int)(wxMULTIPLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxCHANGE_DIR", SWIG_From_int((int)(wxCHANGE_DIR))); 
+        PyDict_SetItemString(d,"CHANGE_DIR", SWIG_From_int((int)(wxCHANGE_DIR))); 
     }
     {
-        PyDict_SetItemString(d,"wxACCEL_ALT", SWIG_From_int((int)(wxACCEL_ALT))); 
+        PyDict_SetItemString(d,"ACCEL_ALT", SWIG_From_int((int)(wxACCEL_ALT))); 
     }
     {
-        PyDict_SetItemString(d,"wxACCEL_CTRL", SWIG_From_int((int)(wxACCEL_CTRL))); 
+        PyDict_SetItemString(d,"ACCEL_CTRL", SWIG_From_int((int)(wxACCEL_CTRL))); 
     }
     {
-        PyDict_SetItemString(d,"wxACCEL_SHIFT", SWIG_From_int((int)(wxACCEL_SHIFT))); 
+        PyDict_SetItemString(d,"ACCEL_SHIFT", SWIG_From_int((int)(wxACCEL_SHIFT))); 
     }
     {
-        PyDict_SetItemString(d,"wxACCEL_NORMAL", SWIG_From_int((int)(wxACCEL_NORMAL))); 
+        PyDict_SetItemString(d,"ACCEL_NORMAL", SWIG_From_int((int)(wxACCEL_NORMAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxPD_AUTO_HIDE", SWIG_From_int((int)(wxPD_AUTO_HIDE))); 
+        PyDict_SetItemString(d,"PD_AUTO_HIDE", SWIG_From_int((int)(wxPD_AUTO_HIDE))); 
     }
     {
-        PyDict_SetItemString(d,"wxPD_APP_MODAL", SWIG_From_int((int)(wxPD_APP_MODAL))); 
+        PyDict_SetItemString(d,"PD_APP_MODAL", SWIG_From_int((int)(wxPD_APP_MODAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxPD_CAN_ABORT", SWIG_From_int((int)(wxPD_CAN_ABORT))); 
+        PyDict_SetItemString(d,"PD_CAN_ABORT", SWIG_From_int((int)(wxPD_CAN_ABORT))); 
     }
     {
-        PyDict_SetItemString(d,"wxPD_ELAPSED_TIME", SWIG_From_int((int)(wxPD_ELAPSED_TIME))); 
+        PyDict_SetItemString(d,"PD_ELAPSED_TIME", SWIG_From_int((int)(wxPD_ELAPSED_TIME))); 
     }
     {
-        PyDict_SetItemString(d,"wxPD_ESTIMATED_TIME", SWIG_From_int((int)(wxPD_ESTIMATED_TIME))); 
+        PyDict_SetItemString(d,"PD_ESTIMATED_TIME", SWIG_From_int((int)(wxPD_ESTIMATED_TIME))); 
     }
     {
-        PyDict_SetItemString(d,"wxPD_REMAINING_TIME", SWIG_From_int((int)(wxPD_REMAINING_TIME))); 
+        PyDict_SetItemString(d,"PD_REMAINING_TIME", SWIG_From_int((int)(wxPD_REMAINING_TIME))); 
     }
     {
-        PyDict_SetItemString(d,"wxPD_SMOOTH", SWIG_From_int((int)(wxPD_SMOOTH))); 
+        PyDict_SetItemString(d,"PD_SMOOTH", SWIG_From_int((int)(wxPD_SMOOTH))); 
     }
     {
-        PyDict_SetItemString(d,"wxPD_CAN_SKIP", SWIG_From_int((int)(wxPD_CAN_SKIP))); 
+        PyDict_SetItemString(d,"PD_CAN_SKIP", SWIG_From_int((int)(wxPD_CAN_SKIP))); 
     }
     {
-        PyDict_SetItemString(d,"wxDD_NEW_DIR_BUTTON", SWIG_From_int((int)(wxDD_NEW_DIR_BUTTON))); 
+        PyDict_SetItemString(d,"DD_NEW_DIR_BUTTON", SWIG_From_int((int)(wxDD_NEW_DIR_BUTTON))); 
     }
     {
-        PyDict_SetItemString(d,"wxDD_DEFAULT_STYLE", SWIG_From_int((int)(wxDD_DEFAULT_STYLE))); 
+        PyDict_SetItemString(d,"DD_DEFAULT_STYLE", SWIG_From_int((int)(wxDD_DEFAULT_STYLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxMENU_TEAROFF", SWIG_From_int((int)(wxMENU_TEAROFF))); 
+        PyDict_SetItemString(d,"MENU_TEAROFF", SWIG_From_int((int)(wxMENU_TEAROFF))); 
     }
     {
-        PyDict_SetItemString(d,"wxMB_DOCKABLE", SWIG_From_int((int)(wxMB_DOCKABLE))); 
+        PyDict_SetItemString(d,"MB_DOCKABLE", SWIG_From_int((int)(wxMB_DOCKABLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxNO_FULL_REPAINT_ON_RESIZE", SWIG_From_int((int)(wxNO_FULL_REPAINT_ON_RESIZE))); 
+        PyDict_SetItemString(d,"NO_FULL_REPAINT_ON_RESIZE", SWIG_From_int((int)(wxNO_FULL_REPAINT_ON_RESIZE))); 
     }
     {
-        PyDict_SetItemString(d,"wxFULL_REPAINT_ON_RESIZE", SWIG_From_int((int)(wxFULL_REPAINT_ON_RESIZE))); 
+        PyDict_SetItemString(d,"FULL_REPAINT_ON_RESIZE", SWIG_From_int((int)(wxFULL_REPAINT_ON_RESIZE))); 
     }
     {
-        PyDict_SetItemString(d,"wxLI_HORIZONTAL", SWIG_From_int((int)(wxLI_HORIZONTAL))); 
+        PyDict_SetItemString(d,"LI_HORIZONTAL", SWIG_From_int((int)(wxLI_HORIZONTAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxLI_VERTICAL", SWIG_From_int((int)(wxLI_VERTICAL))); 
+        PyDict_SetItemString(d,"LI_VERTICAL", SWIG_From_int((int)(wxLI_VERTICAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxWS_EX_VALIDATE_RECURSIVELY", SWIG_From_int((int)(wxWS_EX_VALIDATE_RECURSIVELY))); 
+        PyDict_SetItemString(d,"WS_EX_VALIDATE_RECURSIVELY", SWIG_From_int((int)(wxWS_EX_VALIDATE_RECURSIVELY))); 
     }
     {
-        PyDict_SetItemString(d,"wxWS_EX_BLOCK_EVENTS", SWIG_From_int((int)(wxWS_EX_BLOCK_EVENTS))); 
+        PyDict_SetItemString(d,"WS_EX_BLOCK_EVENTS", SWIG_From_int((int)(wxWS_EX_BLOCK_EVENTS))); 
     }
     {
-        PyDict_SetItemString(d,"wxWS_EX_TRANSIENT", SWIG_From_int((int)(wxWS_EX_TRANSIENT))); 
+        PyDict_SetItemString(d,"WS_EX_TRANSIENT", SWIG_From_int((int)(wxWS_EX_TRANSIENT))); 
     }
     {
-        PyDict_SetItemString(d,"wxWS_EX_THEMED_BACKGROUND", SWIG_From_int((int)(wxWS_EX_THEMED_BACKGROUND))); 
+        PyDict_SetItemString(d,"WS_EX_THEMED_BACKGROUND", SWIG_From_int((int)(wxWS_EX_THEMED_BACKGROUND))); 
     }
     {
-        PyDict_SetItemString(d,"wxWS_EX_PROCESS_IDLE", SWIG_From_int((int)(wxWS_EX_PROCESS_IDLE))); 
+        PyDict_SetItemString(d,"WS_EX_PROCESS_IDLE", SWIG_From_int((int)(wxWS_EX_PROCESS_IDLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxWS_EX_PROCESS_UI_UPDATES", SWIG_From_int((int)(wxWS_EX_PROCESS_UI_UPDATES))); 
+        PyDict_SetItemString(d,"WS_EX_PROCESS_UI_UPDATES", SWIG_From_int((int)(wxWS_EX_PROCESS_UI_UPDATES))); 
     }
     {
-        PyDict_SetItemString(d,"wxMM_TEXT", SWIG_From_int((int)(wxMM_TEXT))); 
+        PyDict_SetItemString(d,"MM_TEXT", SWIG_From_int((int)(wxMM_TEXT))); 
     }
     {
-        PyDict_SetItemString(d,"wxMM_LOMETRIC", SWIG_From_int((int)(wxMM_LOMETRIC))); 
+        PyDict_SetItemString(d,"MM_LOMETRIC", SWIG_From_int((int)(wxMM_LOMETRIC))); 
     }
     {
-        PyDict_SetItemString(d,"wxMM_HIMETRIC", SWIG_From_int((int)(wxMM_HIMETRIC))); 
+        PyDict_SetItemString(d,"MM_HIMETRIC", SWIG_From_int((int)(wxMM_HIMETRIC))); 
     }
     {
-        PyDict_SetItemString(d,"wxMM_LOENGLISH", SWIG_From_int((int)(wxMM_LOENGLISH))); 
+        PyDict_SetItemString(d,"MM_LOENGLISH", SWIG_From_int((int)(wxMM_LOENGLISH))); 
     }
     {
-        PyDict_SetItemString(d,"wxMM_HIENGLISH", SWIG_From_int((int)(wxMM_HIENGLISH))); 
+        PyDict_SetItemString(d,"MM_HIENGLISH", SWIG_From_int((int)(wxMM_HIENGLISH))); 
     }
     {
-        PyDict_SetItemString(d,"wxMM_TWIPS", SWIG_From_int((int)(wxMM_TWIPS))); 
+        PyDict_SetItemString(d,"MM_TWIPS", SWIG_From_int((int)(wxMM_TWIPS))); 
     }
     {
-        PyDict_SetItemString(d,"wxMM_ISOTROPIC", SWIG_From_int((int)(wxMM_ISOTROPIC))); 
+        PyDict_SetItemString(d,"MM_ISOTROPIC", SWIG_From_int((int)(wxMM_ISOTROPIC))); 
     }
     {
-        PyDict_SetItemString(d,"wxMM_ANISOTROPIC", SWIG_From_int((int)(wxMM_ANISOTROPIC))); 
+        PyDict_SetItemString(d,"MM_ANISOTROPIC", SWIG_From_int((int)(wxMM_ANISOTROPIC))); 
     }
     {
-        PyDict_SetItemString(d,"wxMM_POINTS", SWIG_From_int((int)(wxMM_POINTS))); 
+        PyDict_SetItemString(d,"MM_POINTS", SWIG_From_int((int)(wxMM_POINTS))); 
     }
     {
-        PyDict_SetItemString(d,"wxMM_METRIC", SWIG_From_int((int)(wxMM_METRIC))); 
+        PyDict_SetItemString(d,"MM_METRIC", SWIG_From_int((int)(wxMM_METRIC))); 
     }
     {
-        PyDict_SetItemString(d,"wxCENTRE", SWIG_From_int((int)(wxCENTRE))); 
+        PyDict_SetItemString(d,"CENTRE", SWIG_From_int((int)(wxCENTRE))); 
     }
     {
-        PyDict_SetItemString(d,"wxCENTER", SWIG_From_int((int)(wxCENTER))); 
+        PyDict_SetItemString(d,"CENTER", SWIG_From_int((int)(wxCENTER))); 
     }
     {
-        PyDict_SetItemString(d,"wxHORIZONTAL", SWIG_From_int((int)(wxHORIZONTAL))); 
+        PyDict_SetItemString(d,"HORIZONTAL", SWIG_From_int((int)(wxHORIZONTAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxVERTICAL", SWIG_From_int((int)(wxVERTICAL))); 
+        PyDict_SetItemString(d,"VERTICAL", SWIG_From_int((int)(wxVERTICAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxBOTH", SWIG_From_int((int)(wxBOTH))); 
+        PyDict_SetItemString(d,"BOTH", SWIG_From_int((int)(wxBOTH))); 
     }
     {
-        PyDict_SetItemString(d,"wxLEFT", SWIG_From_int((int)(wxLEFT))); 
+        PyDict_SetItemString(d,"LEFT", SWIG_From_int((int)(wxLEFT))); 
     }
     {
-        PyDict_SetItemString(d,"wxRIGHT", SWIG_From_int((int)(wxRIGHT))); 
+        PyDict_SetItemString(d,"RIGHT", SWIG_From_int((int)(wxRIGHT))); 
     }
     {
-        PyDict_SetItemString(d,"wxUP", SWIG_From_int((int)(wxUP))); 
+        PyDict_SetItemString(d,"UP", SWIG_From_int((int)(wxUP))); 
     }
     {
-        PyDict_SetItemString(d,"wxDOWN", SWIG_From_int((int)(wxDOWN))); 
+        PyDict_SetItemString(d,"DOWN", SWIG_From_int((int)(wxDOWN))); 
     }
     {
-        PyDict_SetItemString(d,"wxTOP", SWIG_From_int((int)(wxTOP))); 
+        PyDict_SetItemString(d,"TOP", SWIG_From_int((int)(wxTOP))); 
     }
     {
-        PyDict_SetItemString(d,"wxBOTTOM", SWIG_From_int((int)(wxBOTTOM))); 
+        PyDict_SetItemString(d,"BOTTOM", SWIG_From_int((int)(wxBOTTOM))); 
     }
     {
-        PyDict_SetItemString(d,"wxNORTH", SWIG_From_int((int)(wxNORTH))); 
+        PyDict_SetItemString(d,"NORTH", SWIG_From_int((int)(wxNORTH))); 
     }
     {
-        PyDict_SetItemString(d,"wxSOUTH", SWIG_From_int((int)(wxSOUTH))); 
+        PyDict_SetItemString(d,"SOUTH", SWIG_From_int((int)(wxSOUTH))); 
     }
     {
-        PyDict_SetItemString(d,"wxWEST", SWIG_From_int((int)(wxWEST))); 
+        PyDict_SetItemString(d,"WEST", SWIG_From_int((int)(wxWEST))); 
     }
     {
-        PyDict_SetItemString(d,"wxEAST", SWIG_From_int((int)(wxEAST))); 
+        PyDict_SetItemString(d,"EAST", SWIG_From_int((int)(wxEAST))); 
     }
     {
-        PyDict_SetItemString(d,"wxALL", SWIG_From_int((int)(wxALL))); 
+        PyDict_SetItemString(d,"ALL", SWIG_From_int((int)(wxALL))); 
     }
     {
-        PyDict_SetItemString(d,"wxALIGN_NOT", SWIG_From_int((int)(wxALIGN_NOT))); 
+        PyDict_SetItemString(d,"ALIGN_NOT", SWIG_From_int((int)(wxALIGN_NOT))); 
     }
     {
-        PyDict_SetItemString(d,"wxALIGN_CENTER_HORIZONTAL", SWIG_From_int((int)(wxALIGN_CENTER_HORIZONTAL))); 
+        PyDict_SetItemString(d,"ALIGN_CENTER_HORIZONTAL", SWIG_From_int((int)(wxALIGN_CENTER_HORIZONTAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxALIGN_CENTRE_HORIZONTAL", SWIG_From_int((int)(wxALIGN_CENTRE_HORIZONTAL))); 
+        PyDict_SetItemString(d,"ALIGN_CENTRE_HORIZONTAL", SWIG_From_int((int)(wxALIGN_CENTRE_HORIZONTAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxALIGN_LEFT", SWIG_From_int((int)(wxALIGN_LEFT))); 
+        PyDict_SetItemString(d,"ALIGN_LEFT", SWIG_From_int((int)(wxALIGN_LEFT))); 
     }
     {
-        PyDict_SetItemString(d,"wxALIGN_TOP", SWIG_From_int((int)(wxALIGN_TOP))); 
+        PyDict_SetItemString(d,"ALIGN_TOP", SWIG_From_int((int)(wxALIGN_TOP))); 
     }
     {
-        PyDict_SetItemString(d,"wxALIGN_RIGHT", SWIG_From_int((int)(wxALIGN_RIGHT))); 
+        PyDict_SetItemString(d,"ALIGN_RIGHT", SWIG_From_int((int)(wxALIGN_RIGHT))); 
     }
     {
-        PyDict_SetItemString(d,"wxALIGN_BOTTOM", SWIG_From_int((int)(wxALIGN_BOTTOM))); 
+        PyDict_SetItemString(d,"ALIGN_BOTTOM", SWIG_From_int((int)(wxALIGN_BOTTOM))); 
     }
     {
-        PyDict_SetItemString(d,"wxALIGN_CENTER_VERTICAL", SWIG_From_int((int)(wxALIGN_CENTER_VERTICAL))); 
+        PyDict_SetItemString(d,"ALIGN_CENTER_VERTICAL", SWIG_From_int((int)(wxALIGN_CENTER_VERTICAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxALIGN_CENTRE_VERTICAL", SWIG_From_int((int)(wxALIGN_CENTRE_VERTICAL))); 
+        PyDict_SetItemString(d,"ALIGN_CENTRE_VERTICAL", SWIG_From_int((int)(wxALIGN_CENTRE_VERTICAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxALIGN_CENTER", SWIG_From_int((int)(wxALIGN_CENTER))); 
+        PyDict_SetItemString(d,"ALIGN_CENTER", SWIG_From_int((int)(wxALIGN_CENTER))); 
     }
     {
-        PyDict_SetItemString(d,"wxALIGN_CENTRE", SWIG_From_int((int)(wxALIGN_CENTRE))); 
+        PyDict_SetItemString(d,"ALIGN_CENTRE", SWIG_From_int((int)(wxALIGN_CENTRE))); 
     }
     {
-        PyDict_SetItemString(d,"wxALIGN_MASK", SWIG_From_int((int)(wxALIGN_MASK))); 
+        PyDict_SetItemString(d,"ALIGN_MASK", SWIG_From_int((int)(wxALIGN_MASK))); 
     }
     {
-        PyDict_SetItemString(d,"wxSTRETCH_NOT", SWIG_From_int((int)(wxSTRETCH_NOT))); 
+        PyDict_SetItemString(d,"STRETCH_NOT", SWIG_From_int((int)(wxSTRETCH_NOT))); 
     }
     {
-        PyDict_SetItemString(d,"wxSHRINK", SWIG_From_int((int)(wxSHRINK))); 
+        PyDict_SetItemString(d,"SHRINK", SWIG_From_int((int)(wxSHRINK))); 
     }
     {
-        PyDict_SetItemString(d,"wxGROW", SWIG_From_int((int)(wxGROW))); 
+        PyDict_SetItemString(d,"GROW", SWIG_From_int((int)(wxGROW))); 
     }
     {
-        PyDict_SetItemString(d,"wxEXPAND", SWIG_From_int((int)(wxEXPAND))); 
+        PyDict_SetItemString(d,"EXPAND", SWIG_From_int((int)(wxEXPAND))); 
     }
     {
-        PyDict_SetItemString(d,"wxSHAPED", SWIG_From_int((int)(wxSHAPED))); 
+        PyDict_SetItemString(d,"SHAPED", SWIG_From_int((int)(wxSHAPED))); 
     }
     {
-        PyDict_SetItemString(d,"wxFIXED_MINSIZE", SWIG_From_int((int)(wxFIXED_MINSIZE))); 
+        PyDict_SetItemString(d,"FIXED_MINSIZE", SWIG_From_int((int)(wxFIXED_MINSIZE))); 
     }
     {
-        PyDict_SetItemString(d,"wxTILE", SWIG_From_int((int)(wxTILE))); 
+        PyDict_SetItemString(d,"TILE", SWIG_From_int((int)(wxTILE))); 
     }
     {
-        PyDict_SetItemString(d,"wxADJUST_MINSIZE", SWIG_From_int((int)(wxADJUST_MINSIZE))); 
+        PyDict_SetItemString(d,"ADJUST_MINSIZE", SWIG_From_int((int)(wxADJUST_MINSIZE))); 
     }
     {
-        PyDict_SetItemString(d,"wxBORDER_DEFAULT", SWIG_From_int((int)(wxBORDER_DEFAULT))); 
+        PyDict_SetItemString(d,"BORDER_DEFAULT", SWIG_From_int((int)(wxBORDER_DEFAULT))); 
     }
     {
-        PyDict_SetItemString(d,"wxBORDER_NONE", SWIG_From_int((int)(wxBORDER_NONE))); 
+        PyDict_SetItemString(d,"BORDER_NONE", SWIG_From_int((int)(wxBORDER_NONE))); 
     }
     {
-        PyDict_SetItemString(d,"wxBORDER_STATIC", SWIG_From_int((int)(wxBORDER_STATIC))); 
+        PyDict_SetItemString(d,"BORDER_STATIC", SWIG_From_int((int)(wxBORDER_STATIC))); 
     }
     {
-        PyDict_SetItemString(d,"wxBORDER_SIMPLE", SWIG_From_int((int)(wxBORDER_SIMPLE))); 
+        PyDict_SetItemString(d,"BORDER_SIMPLE", SWIG_From_int((int)(wxBORDER_SIMPLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxBORDER_RAISED", SWIG_From_int((int)(wxBORDER_RAISED))); 
+        PyDict_SetItemString(d,"BORDER_RAISED", SWIG_From_int((int)(wxBORDER_RAISED))); 
     }
     {
-        PyDict_SetItemString(d,"wxBORDER_SUNKEN", SWIG_From_int((int)(wxBORDER_SUNKEN))); 
+        PyDict_SetItemString(d,"BORDER_SUNKEN", SWIG_From_int((int)(wxBORDER_SUNKEN))); 
     }
     {
-        PyDict_SetItemString(d,"wxBORDER_DOUBLE", SWIG_From_int((int)(wxBORDER_DOUBLE))); 
+        PyDict_SetItemString(d,"BORDER_DOUBLE", SWIG_From_int((int)(wxBORDER_DOUBLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxBORDER_MASK", SWIG_From_int((int)(wxBORDER_MASK))); 
+        PyDict_SetItemString(d,"BORDER_MASK", SWIG_From_int((int)(wxBORDER_MASK))); 
     }
     {
-        PyDict_SetItemString(d,"wxBG_STYLE_SYSTEM", SWIG_From_int((int)(wxBG_STYLE_SYSTEM))); 
+        PyDict_SetItemString(d,"BG_STYLE_SYSTEM", SWIG_From_int((int)(wxBG_STYLE_SYSTEM))); 
     }
     {
-        PyDict_SetItemString(d,"wxBG_STYLE_COLOUR", SWIG_From_int((int)(wxBG_STYLE_COLOUR))); 
+        PyDict_SetItemString(d,"BG_STYLE_COLOUR", SWIG_From_int((int)(wxBG_STYLE_COLOUR))); 
     }
     {
-        PyDict_SetItemString(d,"wxBG_STYLE_CUSTOM", SWIG_From_int((int)(wxBG_STYLE_CUSTOM))); 
+        PyDict_SetItemString(d,"BG_STYLE_CUSTOM", SWIG_From_int((int)(wxBG_STYLE_CUSTOM))); 
     }
     {
-        PyDict_SetItemString(d,"wxDEFAULT", SWIG_From_int((int)(wxDEFAULT))); 
+        PyDict_SetItemString(d,"DEFAULT", SWIG_From_int((int)(wxDEFAULT))); 
     }
     {
-        PyDict_SetItemString(d,"wxDECORATIVE", SWIG_From_int((int)(wxDECORATIVE))); 
+        PyDict_SetItemString(d,"DECORATIVE", SWIG_From_int((int)(wxDECORATIVE))); 
     }
     {
-        PyDict_SetItemString(d,"wxROMAN", SWIG_From_int((int)(wxROMAN))); 
+        PyDict_SetItemString(d,"ROMAN", SWIG_From_int((int)(wxROMAN))); 
     }
     {
-        PyDict_SetItemString(d,"wxSCRIPT", SWIG_From_int((int)(wxSCRIPT))); 
+        PyDict_SetItemString(d,"SCRIPT", SWIG_From_int((int)(wxSCRIPT))); 
     }
     {
-        PyDict_SetItemString(d,"wxSWISS", SWIG_From_int((int)(wxSWISS))); 
+        PyDict_SetItemString(d,"SWISS", SWIG_From_int((int)(wxSWISS))); 
     }
     {
-        PyDict_SetItemString(d,"wxMODERN", SWIG_From_int((int)(wxMODERN))); 
+        PyDict_SetItemString(d,"MODERN", SWIG_From_int((int)(wxMODERN))); 
     }
     {
-        PyDict_SetItemString(d,"wxTELETYPE", SWIG_From_int((int)(wxTELETYPE))); 
+        PyDict_SetItemString(d,"TELETYPE", SWIG_From_int((int)(wxTELETYPE))); 
     }
     {
-        PyDict_SetItemString(d,"wxVARIABLE", SWIG_From_int((int)(wxVARIABLE))); 
+        PyDict_SetItemString(d,"VARIABLE", SWIG_From_int((int)(wxVARIABLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxFIXED", SWIG_From_int((int)(wxFIXED))); 
+        PyDict_SetItemString(d,"FIXED", SWIG_From_int((int)(wxFIXED))); 
     }
     {
-        PyDict_SetItemString(d,"wxNORMAL", SWIG_From_int((int)(wxNORMAL))); 
+        PyDict_SetItemString(d,"NORMAL", SWIG_From_int((int)(wxNORMAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxLIGHT", SWIG_From_int((int)(wxLIGHT))); 
+        PyDict_SetItemString(d,"LIGHT", SWIG_From_int((int)(wxLIGHT))); 
     }
     {
-        PyDict_SetItemString(d,"wxBOLD", SWIG_From_int((int)(wxBOLD))); 
+        PyDict_SetItemString(d,"BOLD", SWIG_From_int((int)(wxBOLD))); 
     }
     {
-        PyDict_SetItemString(d,"wxITALIC", SWIG_From_int((int)(wxITALIC))); 
+        PyDict_SetItemString(d,"ITALIC", SWIG_From_int((int)(wxITALIC))); 
     }
     {
-        PyDict_SetItemString(d,"wxSLANT", SWIG_From_int((int)(wxSLANT))); 
+        PyDict_SetItemString(d,"SLANT", SWIG_From_int((int)(wxSLANT))); 
     }
     {
-        PyDict_SetItemString(d,"wxSOLID", SWIG_From_int((int)(wxSOLID))); 
+        PyDict_SetItemString(d,"SOLID", SWIG_From_int((int)(wxSOLID))); 
     }
     {
-        PyDict_SetItemString(d,"wxDOT", SWIG_From_int((int)(wxDOT))); 
+        PyDict_SetItemString(d,"DOT", SWIG_From_int((int)(wxDOT))); 
     }
     {
-        PyDict_SetItemString(d,"wxLONG_DASH", SWIG_From_int((int)(wxLONG_DASH))); 
+        PyDict_SetItemString(d,"LONG_DASH", SWIG_From_int((int)(wxLONG_DASH))); 
     }
     {
-        PyDict_SetItemString(d,"wxSHORT_DASH", SWIG_From_int((int)(wxSHORT_DASH))); 
+        PyDict_SetItemString(d,"SHORT_DASH", SWIG_From_int((int)(wxSHORT_DASH))); 
     }
     {
-        PyDict_SetItemString(d,"wxDOT_DASH", SWIG_From_int((int)(wxDOT_DASH))); 
+        PyDict_SetItemString(d,"DOT_DASH", SWIG_From_int((int)(wxDOT_DASH))); 
     }
     {
-        PyDict_SetItemString(d,"wxUSER_DASH", SWIG_From_int((int)(wxUSER_DASH))); 
+        PyDict_SetItemString(d,"USER_DASH", SWIG_From_int((int)(wxUSER_DASH))); 
     }
     {
-        PyDict_SetItemString(d,"wxTRANSPARENT", SWIG_From_int((int)(wxTRANSPARENT))); 
+        PyDict_SetItemString(d,"TRANSPARENT", SWIG_From_int((int)(wxTRANSPARENT))); 
     }
     {
-        PyDict_SetItemString(d,"wxSTIPPLE", SWIG_From_int((int)(wxSTIPPLE))); 
+        PyDict_SetItemString(d,"STIPPLE", SWIG_From_int((int)(wxSTIPPLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxBDIAGONAL_HATCH", SWIG_From_int((int)(wxBDIAGONAL_HATCH))); 
+        PyDict_SetItemString(d,"STIPPLE_MASK", SWIG_From_int((int)(wxSTIPPLE_MASK))); 
     }
     {
-        PyDict_SetItemString(d,"wxCROSSDIAG_HATCH", SWIG_From_int((int)(wxCROSSDIAG_HATCH))); 
+        PyDict_SetItemString(d,"STIPPLE_MASK_OPAQUE", SWIG_From_int((int)(wxSTIPPLE_MASK_OPAQUE))); 
     }
     {
-        PyDict_SetItemString(d,"wxFDIAGONAL_HATCH", SWIG_From_int((int)(wxFDIAGONAL_HATCH))); 
+        PyDict_SetItemString(d,"BDIAGONAL_HATCH", SWIG_From_int((int)(wxBDIAGONAL_HATCH))); 
     }
     {
-        PyDict_SetItemString(d,"wxCROSS_HATCH", SWIG_From_int((int)(wxCROSS_HATCH))); 
+        PyDict_SetItemString(d,"CROSSDIAG_HATCH", SWIG_From_int((int)(wxCROSSDIAG_HATCH))); 
     }
     {
-        PyDict_SetItemString(d,"wxHORIZONTAL_HATCH", SWIG_From_int((int)(wxHORIZONTAL_HATCH))); 
+        PyDict_SetItemString(d,"FDIAGONAL_HATCH", SWIG_From_int((int)(wxFDIAGONAL_HATCH))); 
     }
     {
-        PyDict_SetItemString(d,"wxVERTICAL_HATCH", SWIG_From_int((int)(wxVERTICAL_HATCH))); 
+        PyDict_SetItemString(d,"CROSS_HATCH", SWIG_From_int((int)(wxCROSS_HATCH))); 
     }
     {
-        PyDict_SetItemString(d,"wxJOIN_BEVEL", SWIG_From_int((int)(wxJOIN_BEVEL))); 
+        PyDict_SetItemString(d,"HORIZONTAL_HATCH", SWIG_From_int((int)(wxHORIZONTAL_HATCH))); 
     }
     {
-        PyDict_SetItemString(d,"wxJOIN_MITER", SWIG_From_int((int)(wxJOIN_MITER))); 
+        PyDict_SetItemString(d,"VERTICAL_HATCH", SWIG_From_int((int)(wxVERTICAL_HATCH))); 
     }
     {
-        PyDict_SetItemString(d,"wxJOIN_ROUND", SWIG_From_int((int)(wxJOIN_ROUND))); 
+        PyDict_SetItemString(d,"JOIN_BEVEL", SWIG_From_int((int)(wxJOIN_BEVEL))); 
     }
     {
-        PyDict_SetItemString(d,"wxCAP_ROUND", SWIG_From_int((int)(wxCAP_ROUND))); 
+        PyDict_SetItemString(d,"JOIN_MITER", SWIG_From_int((int)(wxJOIN_MITER))); 
     }
     {
-        PyDict_SetItemString(d,"wxCAP_PROJECTING", SWIG_From_int((int)(wxCAP_PROJECTING))); 
+        PyDict_SetItemString(d,"JOIN_ROUND", SWIG_From_int((int)(wxJOIN_ROUND))); 
     }
     {
-        PyDict_SetItemString(d,"wxCAP_BUTT", SWIG_From_int((int)(wxCAP_BUTT))); 
+        PyDict_SetItemString(d,"CAP_ROUND", SWIG_From_int((int)(wxCAP_ROUND))); 
     }
     {
-        PyDict_SetItemString(d,"wxCLEAR", SWIG_From_int((int)(wxCLEAR))); 
+        PyDict_SetItemString(d,"CAP_PROJECTING", SWIG_From_int((int)(wxCAP_PROJECTING))); 
     }
     {
-        PyDict_SetItemString(d,"wxXOR", SWIG_From_int((int)(wxXOR))); 
+        PyDict_SetItemString(d,"CAP_BUTT", SWIG_From_int((int)(wxCAP_BUTT))); 
     }
     {
-        PyDict_SetItemString(d,"wxINVERT", SWIG_From_int((int)(wxINVERT))); 
+        PyDict_SetItemString(d,"CLEAR", SWIG_From_int((int)(wxCLEAR))); 
     }
     {
-        PyDict_SetItemString(d,"wxOR_REVERSE", SWIG_From_int((int)(wxOR_REVERSE))); 
+        PyDict_SetItemString(d,"XOR", SWIG_From_int((int)(wxXOR))); 
     }
     {
-        PyDict_SetItemString(d,"wxAND_REVERSE", SWIG_From_int((int)(wxAND_REVERSE))); 
+        PyDict_SetItemString(d,"INVERT", SWIG_From_int((int)(wxINVERT))); 
     }
     {
-        PyDict_SetItemString(d,"wxCOPY", SWIG_From_int((int)(wxCOPY))); 
+        PyDict_SetItemString(d,"OR_REVERSE", SWIG_From_int((int)(wxOR_REVERSE))); 
     }
     {
-        PyDict_SetItemString(d,"wxAND", SWIG_From_int((int)(wxAND))); 
+        PyDict_SetItemString(d,"AND_REVERSE", SWIG_From_int((int)(wxAND_REVERSE))); 
     }
     {
-        PyDict_SetItemString(d,"wxAND_INVERT", SWIG_From_int((int)(wxAND_INVERT))); 
+        PyDict_SetItemString(d,"COPY", SWIG_From_int((int)(wxCOPY))); 
     }
     {
-        PyDict_SetItemString(d,"wxNO_OP", SWIG_From_int((int)(wxNO_OP))); 
+        PyDict_SetItemString(d,"AND", SWIG_From_int((int)(wxAND))); 
     }
     {
-        PyDict_SetItemString(d,"wxNOR", SWIG_From_int((int)(wxNOR))); 
+        PyDict_SetItemString(d,"AND_INVERT", SWIG_From_int((int)(wxAND_INVERT))); 
     }
     {
-        PyDict_SetItemString(d,"wxEQUIV", SWIG_From_int((int)(wxEQUIV))); 
+        PyDict_SetItemString(d,"NO_OP", SWIG_From_int((int)(wxNO_OP))); 
     }
     {
-        PyDict_SetItemString(d,"wxSRC_INVERT", SWIG_From_int((int)(wxSRC_INVERT))); 
+        PyDict_SetItemString(d,"NOR", SWIG_From_int((int)(wxNOR))); 
     }
     {
-        PyDict_SetItemString(d,"wxOR_INVERT", SWIG_From_int((int)(wxOR_INVERT))); 
+        PyDict_SetItemString(d,"EQUIV", SWIG_From_int((int)(wxEQUIV))); 
     }
     {
-        PyDict_SetItemString(d,"wxNAND", SWIG_From_int((int)(wxNAND))); 
+        PyDict_SetItemString(d,"SRC_INVERT", SWIG_From_int((int)(wxSRC_INVERT))); 
     }
     {
-        PyDict_SetItemString(d,"wxOR", SWIG_From_int((int)(wxOR))); 
+        PyDict_SetItemString(d,"OR_INVERT", SWIG_From_int((int)(wxOR_INVERT))); 
     }
     {
-        PyDict_SetItemString(d,"wxSET", SWIG_From_int((int)(wxSET))); 
+        PyDict_SetItemString(d,"NAND", SWIG_From_int((int)(wxNAND))); 
+    }
+    {
+        PyDict_SetItemString(d,"OR", SWIG_From_int((int)(wxOR))); 
+    }
+    {
+        PyDict_SetItemString(d,"SET", SWIG_From_int((int)(wxSET))); 
     }
     {
         PyDict_SetItemString(d,"WXK_BACK", SWIG_From_int((int)(WXK_BACK))); 
@@ -49032,467 +49218,617 @@ SWIGEXPORT(void) SWIG_init(void) {
         PyDict_SetItemString(d,"WXK_SPECIAL20", SWIG_From_int((int)(WXK_SPECIAL20))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_NONE", SWIG_From_int((int)(wxPAPER_NONE))); 
+        PyDict_SetItemString(d,"PAPER_NONE", SWIG_From_int((int)(wxPAPER_NONE))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_LETTER", SWIG_From_int((int)(wxPAPER_LETTER))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_LEGAL", SWIG_From_int((int)(wxPAPER_LEGAL))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_A4", SWIG_From_int((int)(wxPAPER_A4))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_CSHEET", SWIG_From_int((int)(wxPAPER_CSHEET))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_DSHEET", SWIG_From_int((int)(wxPAPER_DSHEET))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ESHEET", SWIG_From_int((int)(wxPAPER_ESHEET))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_LETTERSMALL", SWIG_From_int((int)(wxPAPER_LETTERSMALL))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_TABLOID", SWIG_From_int((int)(wxPAPER_TABLOID))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_LEDGER", SWIG_From_int((int)(wxPAPER_LEDGER))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_STATEMENT", SWIG_From_int((int)(wxPAPER_STATEMENT))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_EXECUTIVE", SWIG_From_int((int)(wxPAPER_EXECUTIVE))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_A3", SWIG_From_int((int)(wxPAPER_A3))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_A4SMALL", SWIG_From_int((int)(wxPAPER_A4SMALL))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_A5", SWIG_From_int((int)(wxPAPER_A5))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_B4", SWIG_From_int((int)(wxPAPER_B4))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_B5", SWIG_From_int((int)(wxPAPER_B5))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_FOLIO", SWIG_From_int((int)(wxPAPER_FOLIO))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_QUARTO", SWIG_From_int((int)(wxPAPER_QUARTO))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_10X14", SWIG_From_int((int)(wxPAPER_10X14))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_11X17", SWIG_From_int((int)(wxPAPER_11X17))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_NOTE", SWIG_From_int((int)(wxPAPER_NOTE))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_9", SWIG_From_int((int)(wxPAPER_ENV_9))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_10", SWIG_From_int((int)(wxPAPER_ENV_10))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_11", SWIG_From_int((int)(wxPAPER_ENV_11))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_12", SWIG_From_int((int)(wxPAPER_ENV_12))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_14", SWIG_From_int((int)(wxPAPER_ENV_14))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_DL", SWIG_From_int((int)(wxPAPER_ENV_DL))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_C5", SWIG_From_int((int)(wxPAPER_ENV_C5))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_C3", SWIG_From_int((int)(wxPAPER_ENV_C3))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_C4", SWIG_From_int((int)(wxPAPER_ENV_C4))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_C6", SWIG_From_int((int)(wxPAPER_ENV_C6))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_C65", SWIG_From_int((int)(wxPAPER_ENV_C65))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_B4", SWIG_From_int((int)(wxPAPER_ENV_B4))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_B5", SWIG_From_int((int)(wxPAPER_ENV_B5))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_B6", SWIG_From_int((int)(wxPAPER_ENV_B6))); 
+    }
+    {
+        PyDict_SetItemString(d,"PAPER_ENV_ITALY", SWIG_From_int((int)(wxPAPER_ENV_ITALY))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_LETTER", SWIG_From_int((int)(wxPAPER_LETTER))); 
+        PyDict_SetItemString(d,"PAPER_ENV_MONARCH", SWIG_From_int((int)(wxPAPER_ENV_MONARCH))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_LEGAL", SWIG_From_int((int)(wxPAPER_LEGAL))); 
+        PyDict_SetItemString(d,"PAPER_ENV_PERSONAL", SWIG_From_int((int)(wxPAPER_ENV_PERSONAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A4", SWIG_From_int((int)(wxPAPER_A4))); 
+        PyDict_SetItemString(d,"PAPER_FANFOLD_US", SWIG_From_int((int)(wxPAPER_FANFOLD_US))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_CSHEET", SWIG_From_int((int)(wxPAPER_CSHEET))); 
+        PyDict_SetItemString(d,"PAPER_FANFOLD_STD_GERMAN", SWIG_From_int((int)(wxPAPER_FANFOLD_STD_GERMAN))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_DSHEET", SWIG_From_int((int)(wxPAPER_DSHEET))); 
+        PyDict_SetItemString(d,"PAPER_FANFOLD_LGL_GERMAN", SWIG_From_int((int)(wxPAPER_FANFOLD_LGL_GERMAN))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ESHEET", SWIG_From_int((int)(wxPAPER_ESHEET))); 
+        PyDict_SetItemString(d,"PAPER_ISO_B4", SWIG_From_int((int)(wxPAPER_ISO_B4))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_LETTERSMALL", SWIG_From_int((int)(wxPAPER_LETTERSMALL))); 
+        PyDict_SetItemString(d,"PAPER_JAPANESE_POSTCARD", SWIG_From_int((int)(wxPAPER_JAPANESE_POSTCARD))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_TABLOID", SWIG_From_int((int)(wxPAPER_TABLOID))); 
+        PyDict_SetItemString(d,"PAPER_9X11", SWIG_From_int((int)(wxPAPER_9X11))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_LEDGER", SWIG_From_int((int)(wxPAPER_LEDGER))); 
+        PyDict_SetItemString(d,"PAPER_10X11", SWIG_From_int((int)(wxPAPER_10X11))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_STATEMENT", SWIG_From_int((int)(wxPAPER_STATEMENT))); 
+        PyDict_SetItemString(d,"PAPER_15X11", SWIG_From_int((int)(wxPAPER_15X11))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_EXECUTIVE", SWIG_From_int((int)(wxPAPER_EXECUTIVE))); 
+        PyDict_SetItemString(d,"PAPER_ENV_INVITE", SWIG_From_int((int)(wxPAPER_ENV_INVITE))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A3", SWIG_From_int((int)(wxPAPER_A3))); 
+        PyDict_SetItemString(d,"PAPER_LETTER_EXTRA", SWIG_From_int((int)(wxPAPER_LETTER_EXTRA))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A4SMALL", SWIG_From_int((int)(wxPAPER_A4SMALL))); 
+        PyDict_SetItemString(d,"PAPER_LEGAL_EXTRA", SWIG_From_int((int)(wxPAPER_LEGAL_EXTRA))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A5", SWIG_From_int((int)(wxPAPER_A5))); 
+        PyDict_SetItemString(d,"PAPER_TABLOID_EXTRA", SWIG_From_int((int)(wxPAPER_TABLOID_EXTRA))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_B4", SWIG_From_int((int)(wxPAPER_B4))); 
+        PyDict_SetItemString(d,"PAPER_A4_EXTRA", SWIG_From_int((int)(wxPAPER_A4_EXTRA))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_B5", SWIG_From_int((int)(wxPAPER_B5))); 
+        PyDict_SetItemString(d,"PAPER_LETTER_TRANSVERSE", SWIG_From_int((int)(wxPAPER_LETTER_TRANSVERSE))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_FOLIO", SWIG_From_int((int)(wxPAPER_FOLIO))); 
+        PyDict_SetItemString(d,"PAPER_A4_TRANSVERSE", SWIG_From_int((int)(wxPAPER_A4_TRANSVERSE))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_QUARTO", SWIG_From_int((int)(wxPAPER_QUARTO))); 
+        PyDict_SetItemString(d,"PAPER_LETTER_EXTRA_TRANSVERSE", SWIG_From_int((int)(wxPAPER_LETTER_EXTRA_TRANSVERSE))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_10X14", SWIG_From_int((int)(wxPAPER_10X14))); 
+        PyDict_SetItemString(d,"PAPER_A_PLUS", SWIG_From_int((int)(wxPAPER_A_PLUS))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_11X17", SWIG_From_int((int)(wxPAPER_11X17))); 
+        PyDict_SetItemString(d,"PAPER_B_PLUS", SWIG_From_int((int)(wxPAPER_B_PLUS))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_NOTE", SWIG_From_int((int)(wxPAPER_NOTE))); 
+        PyDict_SetItemString(d,"PAPER_LETTER_PLUS", SWIG_From_int((int)(wxPAPER_LETTER_PLUS))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_9", SWIG_From_int((int)(wxPAPER_ENV_9))); 
+        PyDict_SetItemString(d,"PAPER_A4_PLUS", SWIG_From_int((int)(wxPAPER_A4_PLUS))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_10", SWIG_From_int((int)(wxPAPER_ENV_10))); 
+        PyDict_SetItemString(d,"PAPER_A5_TRANSVERSE", SWIG_From_int((int)(wxPAPER_A5_TRANSVERSE))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_11", SWIG_From_int((int)(wxPAPER_ENV_11))); 
+        PyDict_SetItemString(d,"PAPER_B5_TRANSVERSE", SWIG_From_int((int)(wxPAPER_B5_TRANSVERSE))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_12", SWIG_From_int((int)(wxPAPER_ENV_12))); 
+        PyDict_SetItemString(d,"PAPER_A3_EXTRA", SWIG_From_int((int)(wxPAPER_A3_EXTRA))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_14", SWIG_From_int((int)(wxPAPER_ENV_14))); 
+        PyDict_SetItemString(d,"PAPER_A5_EXTRA", SWIG_From_int((int)(wxPAPER_A5_EXTRA))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_DL", SWIG_From_int((int)(wxPAPER_ENV_DL))); 
+        PyDict_SetItemString(d,"PAPER_B5_EXTRA", SWIG_From_int((int)(wxPAPER_B5_EXTRA))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_C5", SWIG_From_int((int)(wxPAPER_ENV_C5))); 
+        PyDict_SetItemString(d,"PAPER_A2", SWIG_From_int((int)(wxPAPER_A2))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_C3", SWIG_From_int((int)(wxPAPER_ENV_C3))); 
+        PyDict_SetItemString(d,"PAPER_A3_TRANSVERSE", SWIG_From_int((int)(wxPAPER_A3_TRANSVERSE))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_C4", SWIG_From_int((int)(wxPAPER_ENV_C4))); 
+        PyDict_SetItemString(d,"PAPER_A3_EXTRA_TRANSVERSE", SWIG_From_int((int)(wxPAPER_A3_EXTRA_TRANSVERSE))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_C6", SWIG_From_int((int)(wxPAPER_ENV_C6))); 
+        PyDict_SetItemString(d,"PAPER_DBL_JAPANESE_POSTCARD", SWIG_From_int((int)(wxPAPER_DBL_JAPANESE_POSTCARD))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_C65", SWIG_From_int((int)(wxPAPER_ENV_C65))); 
+        PyDict_SetItemString(d,"PAPER_A6", SWIG_From_int((int)(wxPAPER_A6))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_B4", SWIG_From_int((int)(wxPAPER_ENV_B4))); 
+        PyDict_SetItemString(d,"PAPER_JENV_KAKU2", SWIG_From_int((int)(wxPAPER_JENV_KAKU2))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_B5", SWIG_From_int((int)(wxPAPER_ENV_B5))); 
+        PyDict_SetItemString(d,"PAPER_JENV_KAKU3", SWIG_From_int((int)(wxPAPER_JENV_KAKU3))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_B6", SWIG_From_int((int)(wxPAPER_ENV_B6))); 
+        PyDict_SetItemString(d,"PAPER_JENV_CHOU3", SWIG_From_int((int)(wxPAPER_JENV_CHOU3))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_ITALY", SWIG_From_int((int)(wxPAPER_ENV_ITALY))); 
+        PyDict_SetItemString(d,"PAPER_JENV_CHOU4", SWIG_From_int((int)(wxPAPER_JENV_CHOU4))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_MONARCH", SWIG_From_int((int)(wxPAPER_ENV_MONARCH))); 
+        PyDict_SetItemString(d,"PAPER_LETTER_ROTATED", SWIG_From_int((int)(wxPAPER_LETTER_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_PERSONAL", SWIG_From_int((int)(wxPAPER_ENV_PERSONAL))); 
+        PyDict_SetItemString(d,"PAPER_A3_ROTATED", SWIG_From_int((int)(wxPAPER_A3_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_FANFOLD_US", SWIG_From_int((int)(wxPAPER_FANFOLD_US))); 
+        PyDict_SetItemString(d,"PAPER_A4_ROTATED", SWIG_From_int((int)(wxPAPER_A4_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_FANFOLD_STD_GERMAN", SWIG_From_int((int)(wxPAPER_FANFOLD_STD_GERMAN))); 
+        PyDict_SetItemString(d,"PAPER_A5_ROTATED", SWIG_From_int((int)(wxPAPER_A5_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_FANFOLD_LGL_GERMAN", SWIG_From_int((int)(wxPAPER_FANFOLD_LGL_GERMAN))); 
+        PyDict_SetItemString(d,"PAPER_B4_JIS_ROTATED", SWIG_From_int((int)(wxPAPER_B4_JIS_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ISO_B4", SWIG_From_int((int)(wxPAPER_ISO_B4))); 
+        PyDict_SetItemString(d,"PAPER_B5_JIS_ROTATED", SWIG_From_int((int)(wxPAPER_B5_JIS_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_JAPANESE_POSTCARD", SWIG_From_int((int)(wxPAPER_JAPANESE_POSTCARD))); 
+        PyDict_SetItemString(d,"PAPER_JAPANESE_POSTCARD_ROTATED", SWIG_From_int((int)(wxPAPER_JAPANESE_POSTCARD_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_9X11", SWIG_From_int((int)(wxPAPER_9X11))); 
+        PyDict_SetItemString(d,"PAPER_DBL_JAPANESE_POSTCARD_ROTATED", SWIG_From_int((int)(wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_10X11", SWIG_From_int((int)(wxPAPER_10X11))); 
+        PyDict_SetItemString(d,"PAPER_A6_ROTATED", SWIG_From_int((int)(wxPAPER_A6_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_15X11", SWIG_From_int((int)(wxPAPER_15X11))); 
+        PyDict_SetItemString(d,"PAPER_JENV_KAKU2_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_KAKU2_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_ENV_INVITE", SWIG_From_int((int)(wxPAPER_ENV_INVITE))); 
+        PyDict_SetItemString(d,"PAPER_JENV_KAKU3_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_KAKU3_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_LETTER_EXTRA", SWIG_From_int((int)(wxPAPER_LETTER_EXTRA))); 
+        PyDict_SetItemString(d,"PAPER_JENV_CHOU3_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_CHOU3_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_LEGAL_EXTRA", SWIG_From_int((int)(wxPAPER_LEGAL_EXTRA))); 
+        PyDict_SetItemString(d,"PAPER_JENV_CHOU4_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_CHOU4_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_TABLOID_EXTRA", SWIG_From_int((int)(wxPAPER_TABLOID_EXTRA))); 
+        PyDict_SetItemString(d,"PAPER_B6_JIS", SWIG_From_int((int)(wxPAPER_B6_JIS))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A4_EXTRA", SWIG_From_int((int)(wxPAPER_A4_EXTRA))); 
+        PyDict_SetItemString(d,"PAPER_B6_JIS_ROTATED", SWIG_From_int((int)(wxPAPER_B6_JIS_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_LETTER_TRANSVERSE", SWIG_From_int((int)(wxPAPER_LETTER_TRANSVERSE))); 
+        PyDict_SetItemString(d,"PAPER_12X11", SWIG_From_int((int)(wxPAPER_12X11))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A4_TRANSVERSE", SWIG_From_int((int)(wxPAPER_A4_TRANSVERSE))); 
+        PyDict_SetItemString(d,"PAPER_JENV_YOU4", SWIG_From_int((int)(wxPAPER_JENV_YOU4))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_LETTER_EXTRA_TRANSVERSE", SWIG_From_int((int)(wxPAPER_LETTER_EXTRA_TRANSVERSE))); 
+        PyDict_SetItemString(d,"PAPER_JENV_YOU4_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_YOU4_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A_PLUS", SWIG_From_int((int)(wxPAPER_A_PLUS))); 
+        PyDict_SetItemString(d,"PAPER_P16K", SWIG_From_int((int)(wxPAPER_P16K))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_B_PLUS", SWIG_From_int((int)(wxPAPER_B_PLUS))); 
+        PyDict_SetItemString(d,"PAPER_P32K", SWIG_From_int((int)(wxPAPER_P32K))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_LETTER_PLUS", SWIG_From_int((int)(wxPAPER_LETTER_PLUS))); 
+        PyDict_SetItemString(d,"PAPER_P32KBIG", SWIG_From_int((int)(wxPAPER_P32KBIG))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A4_PLUS", SWIG_From_int((int)(wxPAPER_A4_PLUS))); 
+        PyDict_SetItemString(d,"PAPER_PENV_1", SWIG_From_int((int)(wxPAPER_PENV_1))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A5_TRANSVERSE", SWIG_From_int((int)(wxPAPER_A5_TRANSVERSE))); 
+        PyDict_SetItemString(d,"PAPER_PENV_2", SWIG_From_int((int)(wxPAPER_PENV_2))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_B5_TRANSVERSE", SWIG_From_int((int)(wxPAPER_B5_TRANSVERSE))); 
+        PyDict_SetItemString(d,"PAPER_PENV_3", SWIG_From_int((int)(wxPAPER_PENV_3))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A3_EXTRA", SWIG_From_int((int)(wxPAPER_A3_EXTRA))); 
+        PyDict_SetItemString(d,"PAPER_PENV_4", SWIG_From_int((int)(wxPAPER_PENV_4))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A5_EXTRA", SWIG_From_int((int)(wxPAPER_A5_EXTRA))); 
+        PyDict_SetItemString(d,"PAPER_PENV_5", SWIG_From_int((int)(wxPAPER_PENV_5))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_B5_EXTRA", SWIG_From_int((int)(wxPAPER_B5_EXTRA))); 
+        PyDict_SetItemString(d,"PAPER_PENV_6", SWIG_From_int((int)(wxPAPER_PENV_6))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A2", SWIG_From_int((int)(wxPAPER_A2))); 
+        PyDict_SetItemString(d,"PAPER_PENV_7", SWIG_From_int((int)(wxPAPER_PENV_7))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A3_TRANSVERSE", SWIG_From_int((int)(wxPAPER_A3_TRANSVERSE))); 
+        PyDict_SetItemString(d,"PAPER_PENV_8", SWIG_From_int((int)(wxPAPER_PENV_8))); 
     }
     {
-        PyDict_SetItemString(d,"wxPAPER_A3_EXTRA_TRANSVERSE", SWIG_From_int((int)(wxPAPER_A3_EXTRA_TRANSVERSE))); 
+        PyDict_SetItemString(d,"PAPER_PENV_9", SWIG_From_int((int)(wxPAPER_PENV_9))); 
     }
     {
-        PyDict_SetItemString(d,"wxDUPLEX_SIMPLEX", SWIG_From_int((int)(wxDUPLEX_SIMPLEX))); 
+        PyDict_SetItemString(d,"PAPER_PENV_10", SWIG_From_int((int)(wxPAPER_PENV_10))); 
     }
     {
-        PyDict_SetItemString(d,"wxDUPLEX_HORIZONTAL", SWIG_From_int((int)(wxDUPLEX_HORIZONTAL))); 
+        PyDict_SetItemString(d,"PAPER_P16K_ROTATED", SWIG_From_int((int)(wxPAPER_P16K_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxDUPLEX_VERTICAL", SWIG_From_int((int)(wxDUPLEX_VERTICAL))); 
+        PyDict_SetItemString(d,"PAPER_P32K_ROTATED", SWIG_From_int((int)(wxPAPER_P32K_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxITEM_SEPARATOR", SWIG_From_int((int)(wxITEM_SEPARATOR))); 
+        PyDict_SetItemString(d,"PAPER_P32KBIG_ROTATED", SWIG_From_int((int)(wxPAPER_P32KBIG_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxITEM_NORMAL", SWIG_From_int((int)(wxITEM_NORMAL))); 
+        PyDict_SetItemString(d,"PAPER_PENV_1_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_1_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxITEM_CHECK", SWIG_From_int((int)(wxITEM_CHECK))); 
+        PyDict_SetItemString(d,"PAPER_PENV_2_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_2_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxITEM_RADIO", SWIG_From_int((int)(wxITEM_RADIO))); 
+        PyDict_SetItemString(d,"PAPER_PENV_3_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_3_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxITEM_MAX", SWIG_From_int((int)(wxITEM_MAX))); 
+        PyDict_SetItemString(d,"PAPER_PENV_4_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_4_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_NOWHERE", SWIG_From_int((int)(wxHT_NOWHERE))); 
+        PyDict_SetItemString(d,"PAPER_PENV_5_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_5_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_SCROLLBAR_FIRST", SWIG_From_int((int)(wxHT_SCROLLBAR_FIRST))); 
+        PyDict_SetItemString(d,"PAPER_PENV_6_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_6_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_SCROLLBAR_ARROW_LINE_1", SWIG_From_int((int)(wxHT_SCROLLBAR_ARROW_LINE_1))); 
+        PyDict_SetItemString(d,"PAPER_PENV_7_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_7_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_SCROLLBAR_ARROW_LINE_2", SWIG_From_int((int)(wxHT_SCROLLBAR_ARROW_LINE_2))); 
+        PyDict_SetItemString(d,"PAPER_PENV_8_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_8_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_SCROLLBAR_ARROW_PAGE_1", SWIG_From_int((int)(wxHT_SCROLLBAR_ARROW_PAGE_1))); 
+        PyDict_SetItemString(d,"PAPER_PENV_9_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_9_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_SCROLLBAR_ARROW_PAGE_2", SWIG_From_int((int)(wxHT_SCROLLBAR_ARROW_PAGE_2))); 
+        PyDict_SetItemString(d,"PAPER_PENV_10_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_10_ROTATED))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_SCROLLBAR_THUMB", SWIG_From_int((int)(wxHT_SCROLLBAR_THUMB))); 
+        PyDict_SetItemString(d,"DUPLEX_SIMPLEX", SWIG_From_int((int)(wxDUPLEX_SIMPLEX))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_SCROLLBAR_BAR_1", SWIG_From_int((int)(wxHT_SCROLLBAR_BAR_1))); 
+        PyDict_SetItemString(d,"DUPLEX_HORIZONTAL", SWIG_From_int((int)(wxDUPLEX_HORIZONTAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_SCROLLBAR_BAR_2", SWIG_From_int((int)(wxHT_SCROLLBAR_BAR_2))); 
+        PyDict_SetItemString(d,"DUPLEX_VERTICAL", SWIG_From_int((int)(wxDUPLEX_VERTICAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_SCROLLBAR_LAST", SWIG_From_int((int)(wxHT_SCROLLBAR_LAST))); 
+        PyDict_SetItemString(d,"ITEM_SEPARATOR", SWIG_From_int((int)(wxITEM_SEPARATOR))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_WINDOW_OUTSIDE", SWIG_From_int((int)(wxHT_WINDOW_OUTSIDE))); 
+        PyDict_SetItemString(d,"ITEM_NORMAL", SWIG_From_int((int)(wxITEM_NORMAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_WINDOW_INSIDE", SWIG_From_int((int)(wxHT_WINDOW_INSIDE))); 
+        PyDict_SetItemString(d,"ITEM_CHECK", SWIG_From_int((int)(wxITEM_CHECK))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_WINDOW_VERT_SCROLLBAR", SWIG_From_int((int)(wxHT_WINDOW_VERT_SCROLLBAR))); 
+        PyDict_SetItemString(d,"ITEM_RADIO", SWIG_From_int((int)(wxITEM_RADIO))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_WINDOW_HORZ_SCROLLBAR", SWIG_From_int((int)(wxHT_WINDOW_HORZ_SCROLLBAR))); 
+        PyDict_SetItemString(d,"ITEM_MAX", SWIG_From_int((int)(wxITEM_MAX))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_WINDOW_CORNER", SWIG_From_int((int)(wxHT_WINDOW_CORNER))); 
+        PyDict_SetItemString(d,"HT_NOWHERE", SWIG_From_int((int)(wxHT_NOWHERE))); 
     }
     {
-        PyDict_SetItemString(d,"wxHT_MAX", SWIG_From_int((int)(wxHT_MAX))); 
+        PyDict_SetItemString(d,"HT_SCROLLBAR_FIRST", SWIG_From_int((int)(wxHT_SCROLLBAR_FIRST))); 
     }
     {
-        PyDict_SetItemString(d,"wxMOD_NONE", SWIG_From_int((int)(wxMOD_NONE))); 
+        PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_LINE_1", SWIG_From_int((int)(wxHT_SCROLLBAR_ARROW_LINE_1))); 
     }
     {
-        PyDict_SetItemString(d,"wxMOD_ALT", SWIG_From_int((int)(wxMOD_ALT))); 
+        PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_LINE_2", SWIG_From_int((int)(wxHT_SCROLLBAR_ARROW_LINE_2))); 
     }
     {
-        PyDict_SetItemString(d,"wxMOD_CONTROL", SWIG_From_int((int)(wxMOD_CONTROL))); 
+        PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_PAGE_1", SWIG_From_int((int)(wxHT_SCROLLBAR_ARROW_PAGE_1))); 
     }
     {
-        PyDict_SetItemString(d,"wxMOD_SHIFT", SWIG_From_int((int)(wxMOD_SHIFT))); 
+        PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_PAGE_2", SWIG_From_int((int)(wxHT_SCROLLBAR_ARROW_PAGE_2))); 
     }
     {
-        PyDict_SetItemString(d,"wxMOD_WIN", SWIG_From_int((int)(wxMOD_WIN))); 
+        PyDict_SetItemString(d,"HT_SCROLLBAR_THUMB", SWIG_From_int((int)(wxHT_SCROLLBAR_THUMB))); 
     }
     {
-        PyDict_SetItemString(d,"wxUPDATE_UI_NONE", SWIG_From_int((int)(wxUPDATE_UI_NONE))); 
+        PyDict_SetItemString(d,"HT_SCROLLBAR_BAR_1", SWIG_From_int((int)(wxHT_SCROLLBAR_BAR_1))); 
     }
     {
-        PyDict_SetItemString(d,"wxUPDATE_UI_RECURSE", SWIG_From_int((int)(wxUPDATE_UI_RECURSE))); 
+        PyDict_SetItemString(d,"HT_SCROLLBAR_BAR_2", SWIG_From_int((int)(wxHT_SCROLLBAR_BAR_2))); 
     }
     {
-        PyDict_SetItemString(d,"wxUPDATE_UI_FROMIDLE", SWIG_From_int((int)(wxUPDATE_UI_FROMIDLE))); 
+        PyDict_SetItemString(d,"HT_SCROLLBAR_LAST", SWIG_From_int((int)(wxHT_SCROLLBAR_LAST))); 
+    }
+    {
+        PyDict_SetItemString(d,"HT_WINDOW_OUTSIDE", SWIG_From_int((int)(wxHT_WINDOW_OUTSIDE))); 
+    }
+    {
+        PyDict_SetItemString(d,"HT_WINDOW_INSIDE", SWIG_From_int((int)(wxHT_WINDOW_INSIDE))); 
+    }
+    {
+        PyDict_SetItemString(d,"HT_WINDOW_VERT_SCROLLBAR", SWIG_From_int((int)(wxHT_WINDOW_VERT_SCROLLBAR))); 
+    }
+    {
+        PyDict_SetItemString(d,"HT_WINDOW_HORZ_SCROLLBAR", SWIG_From_int((int)(wxHT_WINDOW_HORZ_SCROLLBAR))); 
+    }
+    {
+        PyDict_SetItemString(d,"HT_WINDOW_CORNER", SWIG_From_int((int)(wxHT_WINDOW_CORNER))); 
+    }
+    {
+        PyDict_SetItemString(d,"HT_MAX", SWIG_From_int((int)(wxHT_MAX))); 
+    }
+    {
+        PyDict_SetItemString(d,"MOD_NONE", SWIG_From_int((int)(wxMOD_NONE))); 
+    }
+    {
+        PyDict_SetItemString(d,"MOD_ALT", SWIG_From_int((int)(wxMOD_ALT))); 
+    }
+    {
+        PyDict_SetItemString(d,"MOD_CONTROL", SWIG_From_int((int)(wxMOD_CONTROL))); 
+    }
+    {
+        PyDict_SetItemString(d,"MOD_SHIFT", SWIG_From_int((int)(wxMOD_SHIFT))); 
+    }
+    {
+        PyDict_SetItemString(d,"MOD_WIN", SWIG_From_int((int)(wxMOD_WIN))); 
+    }
+    {
+        PyDict_SetItemString(d,"UPDATE_UI_NONE", SWIG_From_int((int)(wxUPDATE_UI_NONE))); 
+    }
+    {
+        PyDict_SetItemString(d,"UPDATE_UI_RECURSE", SWIG_From_int((int)(wxUPDATE_UI_RECURSE))); 
+    }
+    {
+        PyDict_SetItemString(d,"UPDATE_UI_FROMIDLE", SWIG_From_int((int)(wxUPDATE_UI_FROMIDLE))); 
     }
     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
     SWIG_addvarlink(SWIG_globals,(char*)"EmptyString",_wrap_EmptyString_get, _wrap_EmptyString_set);
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_INVALID", SWIG_From_int((int)(wxBITMAP_TYPE_INVALID))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_INVALID", SWIG_From_int((int)(wxBITMAP_TYPE_INVALID))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_BMP", SWIG_From_int((int)(wxBITMAP_TYPE_BMP))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_BMP", SWIG_From_int((int)(wxBITMAP_TYPE_BMP))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_ICO", SWIG_From_int((int)(wxBITMAP_TYPE_ICO))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_ICO", SWIG_From_int((int)(wxBITMAP_TYPE_ICO))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_CUR", SWIG_From_int((int)(wxBITMAP_TYPE_CUR))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_CUR", SWIG_From_int((int)(wxBITMAP_TYPE_CUR))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_XBM", SWIG_From_int((int)(wxBITMAP_TYPE_XBM))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_XBM", SWIG_From_int((int)(wxBITMAP_TYPE_XBM))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_XBM_DATA", SWIG_From_int((int)(wxBITMAP_TYPE_XBM_DATA))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_XBM_DATA", SWIG_From_int((int)(wxBITMAP_TYPE_XBM_DATA))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_XPM", SWIG_From_int((int)(wxBITMAP_TYPE_XPM))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_XPM", SWIG_From_int((int)(wxBITMAP_TYPE_XPM))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_XPM_DATA", SWIG_From_int((int)(wxBITMAP_TYPE_XPM_DATA))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_XPM_DATA", SWIG_From_int((int)(wxBITMAP_TYPE_XPM_DATA))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_TIF", SWIG_From_int((int)(wxBITMAP_TYPE_TIF))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_TIF", SWIG_From_int((int)(wxBITMAP_TYPE_TIF))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_GIF", SWIG_From_int((int)(wxBITMAP_TYPE_GIF))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_GIF", SWIG_From_int((int)(wxBITMAP_TYPE_GIF))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_PNG", SWIG_From_int((int)(wxBITMAP_TYPE_PNG))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_PNG", SWIG_From_int((int)(wxBITMAP_TYPE_PNG))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_JPEG", SWIG_From_int((int)(wxBITMAP_TYPE_JPEG))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_JPEG", SWIG_From_int((int)(wxBITMAP_TYPE_JPEG))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_PNM", SWIG_From_int((int)(wxBITMAP_TYPE_PNM))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_PNM", SWIG_From_int((int)(wxBITMAP_TYPE_PNM))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_PCX", SWIG_From_int((int)(wxBITMAP_TYPE_PCX))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_PCX", SWIG_From_int((int)(wxBITMAP_TYPE_PCX))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_PICT", SWIG_From_int((int)(wxBITMAP_TYPE_PICT))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_PICT", SWIG_From_int((int)(wxBITMAP_TYPE_PICT))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_ICON", SWIG_From_int((int)(wxBITMAP_TYPE_ICON))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_ICON", SWIG_From_int((int)(wxBITMAP_TYPE_ICON))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_ANI", SWIG_From_int((int)(wxBITMAP_TYPE_ANI))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_ANI", SWIG_From_int((int)(wxBITMAP_TYPE_ANI))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_IFF", SWIG_From_int((int)(wxBITMAP_TYPE_IFF))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_IFF", SWIG_From_int((int)(wxBITMAP_TYPE_IFF))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_MACCURSOR", SWIG_From_int((int)(wxBITMAP_TYPE_MACCURSOR))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_MACCURSOR", SWIG_From_int((int)(wxBITMAP_TYPE_MACCURSOR))); 
     }
     {
-        PyDict_SetItemString(d,"wxBITMAP_TYPE_ANY", SWIG_From_int((int)(wxBITMAP_TYPE_ANY))); 
+        PyDict_SetItemString(d,"BITMAP_TYPE_ANY", SWIG_From_int((int)(wxBITMAP_TYPE_ANY))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_NONE", SWIG_From_int((int)(wxCURSOR_NONE))); 
+        PyDict_SetItemString(d,"CURSOR_NONE", SWIG_From_int((int)(wxCURSOR_NONE))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_ARROW", SWIG_From_int((int)(wxCURSOR_ARROW))); 
+        PyDict_SetItemString(d,"CURSOR_ARROW", SWIG_From_int((int)(wxCURSOR_ARROW))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_RIGHT_ARROW", SWIG_From_int((int)(wxCURSOR_RIGHT_ARROW))); 
+        PyDict_SetItemString(d,"CURSOR_RIGHT_ARROW", SWIG_From_int((int)(wxCURSOR_RIGHT_ARROW))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_BULLSEYE", SWIG_From_int((int)(wxCURSOR_BULLSEYE))); 
+        PyDict_SetItemString(d,"CURSOR_BULLSEYE", SWIG_From_int((int)(wxCURSOR_BULLSEYE))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_CHAR", SWIG_From_int((int)(wxCURSOR_CHAR))); 
+        PyDict_SetItemString(d,"CURSOR_CHAR", SWIG_From_int((int)(wxCURSOR_CHAR))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_CROSS", SWIG_From_int((int)(wxCURSOR_CROSS))); 
+        PyDict_SetItemString(d,"CURSOR_CROSS", SWIG_From_int((int)(wxCURSOR_CROSS))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_HAND", SWIG_From_int((int)(wxCURSOR_HAND))); 
+        PyDict_SetItemString(d,"CURSOR_HAND", SWIG_From_int((int)(wxCURSOR_HAND))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_IBEAM", SWIG_From_int((int)(wxCURSOR_IBEAM))); 
+        PyDict_SetItemString(d,"CURSOR_IBEAM", SWIG_From_int((int)(wxCURSOR_IBEAM))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_LEFT_BUTTON", SWIG_From_int((int)(wxCURSOR_LEFT_BUTTON))); 
+        PyDict_SetItemString(d,"CURSOR_LEFT_BUTTON", SWIG_From_int((int)(wxCURSOR_LEFT_BUTTON))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_MAGNIFIER", SWIG_From_int((int)(wxCURSOR_MAGNIFIER))); 
+        PyDict_SetItemString(d,"CURSOR_MAGNIFIER", SWIG_From_int((int)(wxCURSOR_MAGNIFIER))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_MIDDLE_BUTTON", SWIG_From_int((int)(wxCURSOR_MIDDLE_BUTTON))); 
+        PyDict_SetItemString(d,"CURSOR_MIDDLE_BUTTON", SWIG_From_int((int)(wxCURSOR_MIDDLE_BUTTON))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_NO_ENTRY", SWIG_From_int((int)(wxCURSOR_NO_ENTRY))); 
+        PyDict_SetItemString(d,"CURSOR_NO_ENTRY", SWIG_From_int((int)(wxCURSOR_NO_ENTRY))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_PAINT_BRUSH", SWIG_From_int((int)(wxCURSOR_PAINT_BRUSH))); 
+        PyDict_SetItemString(d,"CURSOR_PAINT_BRUSH", SWIG_From_int((int)(wxCURSOR_PAINT_BRUSH))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_PENCIL", SWIG_From_int((int)(wxCURSOR_PENCIL))); 
+        PyDict_SetItemString(d,"CURSOR_PENCIL", SWIG_From_int((int)(wxCURSOR_PENCIL))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_POINT_LEFT", SWIG_From_int((int)(wxCURSOR_POINT_LEFT))); 
+        PyDict_SetItemString(d,"CURSOR_POINT_LEFT", SWIG_From_int((int)(wxCURSOR_POINT_LEFT))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_POINT_RIGHT", SWIG_From_int((int)(wxCURSOR_POINT_RIGHT))); 
+        PyDict_SetItemString(d,"CURSOR_POINT_RIGHT", SWIG_From_int((int)(wxCURSOR_POINT_RIGHT))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_QUESTION_ARROW", SWIG_From_int((int)(wxCURSOR_QUESTION_ARROW))); 
+        PyDict_SetItemString(d,"CURSOR_QUESTION_ARROW", SWIG_From_int((int)(wxCURSOR_QUESTION_ARROW))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_RIGHT_BUTTON", SWIG_From_int((int)(wxCURSOR_RIGHT_BUTTON))); 
+        PyDict_SetItemString(d,"CURSOR_RIGHT_BUTTON", SWIG_From_int((int)(wxCURSOR_RIGHT_BUTTON))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_SIZENESW", SWIG_From_int((int)(wxCURSOR_SIZENESW))); 
+        PyDict_SetItemString(d,"CURSOR_SIZENESW", SWIG_From_int((int)(wxCURSOR_SIZENESW))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_SIZENS", SWIG_From_int((int)(wxCURSOR_SIZENS))); 
+        PyDict_SetItemString(d,"CURSOR_SIZENS", SWIG_From_int((int)(wxCURSOR_SIZENS))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_SIZENWSE", SWIG_From_int((int)(wxCURSOR_SIZENWSE))); 
+        PyDict_SetItemString(d,"CURSOR_SIZENWSE", SWIG_From_int((int)(wxCURSOR_SIZENWSE))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_SIZEWE", SWIG_From_int((int)(wxCURSOR_SIZEWE))); 
+        PyDict_SetItemString(d,"CURSOR_SIZEWE", SWIG_From_int((int)(wxCURSOR_SIZEWE))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_SIZING", SWIG_From_int((int)(wxCURSOR_SIZING))); 
+        PyDict_SetItemString(d,"CURSOR_SIZING", SWIG_From_int((int)(wxCURSOR_SIZING))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_SPRAYCAN", SWIG_From_int((int)(wxCURSOR_SPRAYCAN))); 
+        PyDict_SetItemString(d,"CURSOR_SPRAYCAN", SWIG_From_int((int)(wxCURSOR_SPRAYCAN))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_WAIT", SWIG_From_int((int)(wxCURSOR_WAIT))); 
+        PyDict_SetItemString(d,"CURSOR_WAIT", SWIG_From_int((int)(wxCURSOR_WAIT))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_WATCH", SWIG_From_int((int)(wxCURSOR_WATCH))); 
+        PyDict_SetItemString(d,"CURSOR_WATCH", SWIG_From_int((int)(wxCURSOR_WATCH))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_BLANK", SWIG_From_int((int)(wxCURSOR_BLANK))); 
+        PyDict_SetItemString(d,"CURSOR_BLANK", SWIG_From_int((int)(wxCURSOR_BLANK))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_DEFAULT", SWIG_From_int((int)(wxCURSOR_DEFAULT))); 
+        PyDict_SetItemString(d,"CURSOR_DEFAULT", SWIG_From_int((int)(wxCURSOR_DEFAULT))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_COPY_ARROW", SWIG_From_int((int)(wxCURSOR_COPY_ARROW))); 
+        PyDict_SetItemString(d,"CURSOR_COPY_ARROW", SWIG_From_int((int)(wxCURSOR_COPY_ARROW))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_ARROWWAIT", SWIG_From_int((int)(wxCURSOR_ARROWWAIT))); 
+        PyDict_SetItemString(d,"CURSOR_ARROWWAIT", SWIG_From_int((int)(wxCURSOR_ARROWWAIT))); 
     }
     {
-        PyDict_SetItemString(d,"wxCURSOR_MAX", SWIG_From_int((int)(wxCURSOR_MAX))); 
+        PyDict_SetItemString(d,"CURSOR_MAX", SWIG_From_int((int)(wxCURSOR_MAX))); 
     }
-    SWIG_addvarlink(SWIG_globals,(char*)"wxDefaultPosition",_wrap_wxDefaultPosition_get, _wrap_wxDefaultPosition_set);
-    SWIG_addvarlink(SWIG_globals,(char*)"wxDefaultSize",_wrap_wxDefaultSize_get, _wrap_wxDefaultSize_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"DefaultPosition",_wrap_DefaultPosition_get, _wrap_DefaultPosition_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"DefaultSize",_wrap_DefaultSize_get, _wrap_DefaultSize_set);
     {
-        PyDict_SetItemString(d,"wxFromStart", SWIG_From_int((int)(wxFromStart))); 
+        PyDict_SetItemString(d,"FromStart", SWIG_From_int((int)(wxFromStart))); 
     }
     {
-        PyDict_SetItemString(d,"wxFromCurrent", SWIG_From_int((int)(wxFromCurrent))); 
+        PyDict_SetItemString(d,"FromCurrent", SWIG_From_int((int)(wxFromCurrent))); 
     }
     {
-        PyDict_SetItemString(d,"wxFromEnd", SWIG_From_int((int)(wxFromEnd))); 
+        PyDict_SetItemString(d,"FromEnd", SWIG_From_int((int)(wxFromEnd))); 
     }
     
     wxPyPtrTypeMap_Add("wxInputStream", "wxPyInputStream");
@@ -49500,7 +49836,16 @@ SWIGEXPORT(void) SWIG_init(void) {
     
     wxPyPtrTypeMap_Add("wxFileSystemHandler", "wxPyFileSystemHandler");
     
-    SWIG_addvarlink(SWIG_globals,(char*)"wxNullImage",_wrap_wxNullImage_get, _wrap_wxNullImage_set);
+    {
+        PyDict_SetItemString(d,"IMAGE_ALPHA_TRANSPARENT", SWIG_From_int((int)(wxIMAGE_ALPHA_TRANSPARENT))); 
+    }
+    {
+        PyDict_SetItemString(d,"IMAGE_ALPHA_THRESHOLD", SWIG_From_int((int)(wxIMAGE_ALPHA_THRESHOLD))); 
+    }
+    {
+        PyDict_SetItemString(d,"IMAGE_ALPHA_OPAQUE", SWIG_From_int((int)(wxIMAGE_ALPHA_OPAQUE))); 
+    }
+    SWIG_addvarlink(SWIG_globals,(char*)"NullImage",_wrap_NullImage_get, _wrap_NullImage_set);
     SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_FILENAME",_wrap_IMAGE_OPTION_FILENAME_get, _wrap_IMAGE_OPTION_FILENAME_set);
     SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_BMP_FORMAT",_wrap_IMAGE_OPTION_BMP_FORMAT_get, _wrap_IMAGE_OPTION_BMP_FORMAT_set);
     SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_CUR_HOTSPOT_X",_wrap_IMAGE_OPTION_CUR_HOTSPOT_X_get, _wrap_IMAGE_OPTION_CUR_HOTSPOT_X_set);
@@ -49511,10 +49856,10 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_RESOLUTIONUNIT",_wrap_IMAGE_OPTION_RESOLUTIONUNIT_get, _wrap_IMAGE_OPTION_RESOLUTIONUNIT_set);
     SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_QUALITY",_wrap_IMAGE_OPTION_QUALITY_get, _wrap_IMAGE_OPTION_QUALITY_set);
     {
-        PyDict_SetItemString(d,"wxIMAGE_RESOLUTION_INCHES", SWIG_From_int((int)(wxIMAGE_RESOLUTION_INCHES))); 
+        PyDict_SetItemString(d,"IMAGE_RESOLUTION_INCHES", SWIG_From_int((int)(wxIMAGE_RESOLUTION_INCHES))); 
     }
     {
-        PyDict_SetItemString(d,"wxIMAGE_RESOLUTION_CM", SWIG_From_int((int)(wxIMAGE_RESOLUTION_CM))); 
+        PyDict_SetItemString(d,"IMAGE_RESOLUTION_CM", SWIG_From_int((int)(wxIMAGE_RESOLUTION_CM))); 
     }
     SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_BITSPERSAMPLE",_wrap_IMAGE_OPTION_BITSPERSAMPLE_get, _wrap_IMAGE_OPTION_BITSPERSAMPLE_set);
     SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_SAMPLESPERPIXEL",_wrap_IMAGE_OPTION_SAMPLESPERPIXEL_get, _wrap_IMAGE_OPTION_SAMPLESPERPIXEL_set);
@@ -49523,52 +49868,52 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_PNG_FORMAT",_wrap_IMAGE_OPTION_PNG_FORMAT_get, _wrap_IMAGE_OPTION_PNG_FORMAT_set);
     SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_PNG_BITDEPTH",_wrap_IMAGE_OPTION_PNG_BITDEPTH_get, _wrap_IMAGE_OPTION_PNG_BITDEPTH_set);
     {
-        PyDict_SetItemString(d,"wxPNG_TYPE_COLOUR", SWIG_From_int((int)(wxPNG_TYPE_COLOUR))); 
+        PyDict_SetItemString(d,"PNG_TYPE_COLOUR", SWIG_From_int((int)(wxPNG_TYPE_COLOUR))); 
     }
     {
-        PyDict_SetItemString(d,"wxPNG_TYPE_GREY", SWIG_From_int((int)(wxPNG_TYPE_GREY))); 
+        PyDict_SetItemString(d,"PNG_TYPE_GREY", SWIG_From_int((int)(wxPNG_TYPE_GREY))); 
     }
     {
-        PyDict_SetItemString(d,"wxPNG_TYPE_GREY_RED", SWIG_From_int((int)(wxPNG_TYPE_GREY_RED))); 
+        PyDict_SetItemString(d,"PNG_TYPE_GREY_RED", SWIG_From_int((int)(wxPNG_TYPE_GREY_RED))); 
     }
     {
-        PyDict_SetItemString(d,"wxBMP_24BPP", SWIG_From_int((int)(wxBMP_24BPP))); 
+        PyDict_SetItemString(d,"BMP_24BPP", SWIG_From_int((int)(wxBMP_24BPP))); 
     }
     {
-        PyDict_SetItemString(d,"wxBMP_8BPP", SWIG_From_int((int)(wxBMP_8BPP))); 
+        PyDict_SetItemString(d,"BMP_8BPP", SWIG_From_int((int)(wxBMP_8BPP))); 
     }
     {
-        PyDict_SetItemString(d,"wxBMP_8BPP_GREY", SWIG_From_int((int)(wxBMP_8BPP_GREY))); 
+        PyDict_SetItemString(d,"BMP_8BPP_GREY", SWIG_From_int((int)(wxBMP_8BPP_GREY))); 
     }
     {
-        PyDict_SetItemString(d,"wxBMP_8BPP_GRAY", SWIG_From_int((int)(wxBMP_8BPP_GRAY))); 
+        PyDict_SetItemString(d,"BMP_8BPP_GRAY", SWIG_From_int((int)(wxBMP_8BPP_GRAY))); 
     }
     {
-        PyDict_SetItemString(d,"wxBMP_8BPP_RED", SWIG_From_int((int)(wxBMP_8BPP_RED))); 
+        PyDict_SetItemString(d,"BMP_8BPP_RED", SWIG_From_int((int)(wxBMP_8BPP_RED))); 
     }
     {
-        PyDict_SetItemString(d,"wxBMP_8BPP_PALETTE", SWIG_From_int((int)(wxBMP_8BPP_PALETTE))); 
+        PyDict_SetItemString(d,"BMP_8BPP_PALETTE", SWIG_From_int((int)(wxBMP_8BPP_PALETTE))); 
     }
     {
-        PyDict_SetItemString(d,"wxBMP_4BPP", SWIG_From_int((int)(wxBMP_4BPP))); 
+        PyDict_SetItemString(d,"BMP_4BPP", SWIG_From_int((int)(wxBMP_4BPP))); 
     }
     {
-        PyDict_SetItemString(d,"wxBMP_1BPP", SWIG_From_int((int)(wxBMP_1BPP))); 
+        PyDict_SetItemString(d,"BMP_1BPP", SWIG_From_int((int)(wxBMP_1BPP))); 
     }
     {
-        PyDict_SetItemString(d,"wxBMP_1BPP_BW", SWIG_From_int((int)(wxBMP_1BPP_BW))); 
+        PyDict_SetItemString(d,"BMP_1BPP_BW", SWIG_From_int((int)(wxBMP_1BPP_BW))); 
     }
     {
-        PyDict_SetItemString(d,"wxQUANTIZE_INCLUDE_WINDOWS_COLOURS", SWIG_From_int((int)(wxQUANTIZE_INCLUDE_WINDOWS_COLOURS))); 
+        PyDict_SetItemString(d,"QUANTIZE_INCLUDE_WINDOWS_COLOURS", SWIG_From_int((int)(wxQUANTIZE_INCLUDE_WINDOWS_COLOURS))); 
     }
     {
-        PyDict_SetItemString(d,"wxQUANTIZE_FILL_DESTINATION_IMAGE", SWIG_From_int((int)(wxQUANTIZE_FILL_DESTINATION_IMAGE))); 
+        PyDict_SetItemString(d,"QUANTIZE_FILL_DESTINATION_IMAGE", SWIG_From_int((int)(wxQUANTIZE_FILL_DESTINATION_IMAGE))); 
     }
     {
-        PyDict_SetItemString(d,"wxEVENT_PROPAGATE_NONE", SWIG_From_int((int)(wxEVENT_PROPAGATE_NONE))); 
+        PyDict_SetItemString(d,"EVENT_PROPAGATE_NONE", SWIG_From_int((int)(wxEVENT_PROPAGATE_NONE))); 
     }
     {
-        PyDict_SetItemString(d,"wxEVENT_PROPAGATE_MAX", SWIG_From_int((int)(wxEVENT_PROPAGATE_MAX))); 
+        PyDict_SetItemString(d,"EVENT_PROPAGATE_MAX", SWIG_From_int((int)(wxEVENT_PROPAGATE_MAX))); 
     }
     PyDict_SetItemString(d, "wxEVT_NULL", PyInt_FromLong(wxEVT_NULL));
     PyDict_SetItemString(d, "wxEVT_FIRST", PyInt_FromLong(wxEVT_FIRST));
@@ -49632,7 +49977,7 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d, "wxEVT_SCROLL_PAGEDOWN", PyInt_FromLong(wxEVT_SCROLL_PAGEDOWN));
     PyDict_SetItemString(d, "wxEVT_SCROLL_THUMBTRACK", PyInt_FromLong(wxEVT_SCROLL_THUMBTRACK));
     PyDict_SetItemString(d, "wxEVT_SCROLL_THUMBRELEASE", PyInt_FromLong(wxEVT_SCROLL_THUMBRELEASE));
-    PyDict_SetItemString(d, "wxEVT_SCROLL_ENDSCROLL", PyInt_FromLong(wxEVT_SCROLL_ENDSCROLL));
+    PyDict_SetItemString(d, "wxEVT_SCROLL_CHANGED", PyInt_FromLong(wxEVT_SCROLL_CHANGED));
     PyDict_SetItemString(d, "wxEVT_SCROLLWIN_TOP", PyInt_FromLong(wxEVT_SCROLLWIN_TOP));
     PyDict_SetItemString(d, "wxEVT_SCROLLWIN_BOTTOM", PyInt_FromLong(wxEVT_SCROLLWIN_BOTTOM));
     PyDict_SetItemString(d, "wxEVT_SCROLLWIN_LINEUP", PyInt_FromLong(wxEVT_SCROLLWIN_LINEUP));
@@ -49686,148 +50031,148 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d, "wxEVT_COMMAND_KILL_FOCUS", PyInt_FromLong(wxEVT_COMMAND_KILL_FOCUS));
     PyDict_SetItemString(d, "wxEVT_COMMAND_ENTER", PyInt_FromLong(wxEVT_COMMAND_ENTER));
     {
-        PyDict_SetItemString(d,"wxMOUSE_BTN_ANY", SWIG_From_int((int)(wxMOUSE_BTN_ANY))); 
+        PyDict_SetItemString(d,"MOUSE_BTN_ANY", SWIG_From_int((int)(wxMOUSE_BTN_ANY))); 
     }
     {
-        PyDict_SetItemString(d,"wxMOUSE_BTN_NONE", SWIG_From_int((int)(wxMOUSE_BTN_NONE))); 
+        PyDict_SetItemString(d,"MOUSE_BTN_NONE", SWIG_From_int((int)(wxMOUSE_BTN_NONE))); 
     }
     {
-        PyDict_SetItemString(d,"wxMOUSE_BTN_LEFT", SWIG_From_int((int)(wxMOUSE_BTN_LEFT))); 
+        PyDict_SetItemString(d,"MOUSE_BTN_LEFT", SWIG_From_int((int)(wxMOUSE_BTN_LEFT))); 
     }
     {
-        PyDict_SetItemString(d,"wxMOUSE_BTN_MIDDLE", SWIG_From_int((int)(wxMOUSE_BTN_MIDDLE))); 
+        PyDict_SetItemString(d,"MOUSE_BTN_MIDDLE", SWIG_From_int((int)(wxMOUSE_BTN_MIDDLE))); 
     }
     {
-        PyDict_SetItemString(d,"wxMOUSE_BTN_RIGHT", SWIG_From_int((int)(wxMOUSE_BTN_RIGHT))); 
+        PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_From_int((int)(wxMOUSE_BTN_RIGHT))); 
     }
     {
-        PyDict_SetItemString(d,"wxUPDATE_UI_PROCESS_ALL", SWIG_From_int((int)(wxUPDATE_UI_PROCESS_ALL))); 
+        PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_From_int((int)(wxUPDATE_UI_PROCESS_ALL))); 
     }
     {
-        PyDict_SetItemString(d,"wxUPDATE_UI_PROCESS_SPECIFIED", SWIG_From_int((int)(wxUPDATE_UI_PROCESS_SPECIFIED))); 
+        PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_From_int((int)(wxUPDATE_UI_PROCESS_SPECIFIED))); 
     }
     {
-        PyDict_SetItemString(d,"wxNavigationKeyEvent_IsBackward", SWIG_From_int((int)(wxNavigationKeyEvent::IsBackward))); 
+        PyDict_SetItemString(d,"NavigationKeyEvent_IsBackward", SWIG_From_int((int)(wxNavigationKeyEvent::IsBackward))); 
     }
     {
-        PyDict_SetItemString(d,"wxNavigationKeyEvent_IsForward", SWIG_From_int((int)(wxNavigationKeyEvent::IsForward))); 
+        PyDict_SetItemString(d,"NavigationKeyEvent_IsForward", SWIG_From_int((int)(wxNavigationKeyEvent::IsForward))); 
     }
     {
-        PyDict_SetItemString(d,"wxNavigationKeyEvent_WinChange", SWIG_From_int((int)(wxNavigationKeyEvent::WinChange))); 
+        PyDict_SetItemString(d,"NavigationKeyEvent_WinChange", SWIG_From_int((int)(wxNavigationKeyEvent::WinChange))); 
     }
     {
-        PyDict_SetItemString(d,"wxNavigationKeyEvent_FromTab", SWIG_From_int((int)(wxNavigationKeyEvent::FromTab))); 
+        PyDict_SetItemString(d,"NavigationKeyEvent_FromTab", SWIG_From_int((int)(wxNavigationKeyEvent::FromTab))); 
     }
     {
-        PyDict_SetItemString(d,"wxIDLE_PROCESS_ALL", SWIG_From_int((int)(wxIDLE_PROCESS_ALL))); 
+        PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_From_int((int)(wxIDLE_PROCESS_ALL))); 
     }
     {
-        PyDict_SetItemString(d,"wxIDLE_PROCESS_SPECIFIED", SWIG_From_int((int)(wxIDLE_PROCESS_SPECIFIED))); 
+        PyDict_SetItemString(d,"IDLE_PROCESS_SPECIFIED", SWIG_From_int((int)(wxIDLE_PROCESS_SPECIFIED))); 
     }
     PyDict_SetItemString(d, "wxEVT_DATE_CHANGED", PyInt_FromLong(wxEVT_DATE_CHANGED));
     {
-        PyDict_SetItemString(d,"wxPYAPP_ASSERT_SUPPRESS", SWIG_From_int((int)(wxPYAPP_ASSERT_SUPPRESS))); 
+        PyDict_SetItemString(d,"PYAPP_ASSERT_SUPPRESS", SWIG_From_int((int)(wxPYAPP_ASSERT_SUPPRESS))); 
     }
     {
-        PyDict_SetItemString(d,"wxPYAPP_ASSERT_EXCEPTION", SWIG_From_int((int)(wxPYAPP_ASSERT_EXCEPTION))); 
+        PyDict_SetItemString(d,"PYAPP_ASSERT_EXCEPTION", SWIG_From_int((int)(wxPYAPP_ASSERT_EXCEPTION))); 
     }
     {
-        PyDict_SetItemString(d,"wxPYAPP_ASSERT_DIALOG", SWIG_From_int((int)(wxPYAPP_ASSERT_DIALOG))); 
+        PyDict_SetItemString(d,"PYAPP_ASSERT_DIALOG", SWIG_From_int((int)(wxPYAPP_ASSERT_DIALOG))); 
     }
     {
-        PyDict_SetItemString(d,"wxPYAPP_ASSERT_LOG", SWIG_From_int((int)(wxPYAPP_ASSERT_LOG))); 
+        PyDict_SetItemString(d,"PYAPP_ASSERT_LOG", SWIG_From_int((int)(wxPYAPP_ASSERT_LOG))); 
     }
     {
-        PyDict_SetItemString(d,"wxPRINT_WINDOWS", SWIG_From_int((int)(wxPRINT_WINDOWS))); 
+        PyDict_SetItemString(d,"PRINT_WINDOWS", SWIG_From_int((int)(wxPRINT_WINDOWS))); 
     }
     {
-        PyDict_SetItemString(d,"wxPRINT_POSTSCRIPT", SWIG_From_int((int)(wxPRINT_POSTSCRIPT))); 
+        PyDict_SetItemString(d,"PRINT_POSTSCRIPT", SWIG_From_int((int)(wxPRINT_POSTSCRIPT))); 
     }
-    SWIG_addvarlink(SWIG_globals,(char*)"wxNullAcceleratorTable",_wrap_wxNullAcceleratorTable_get, _wrap_wxNullAcceleratorTable_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set);
     SWIG_addvarlink(SWIG_globals,(char*)"PanelNameStr",_wrap_PanelNameStr_get, _wrap_PanelNameStr_set);
     {
-        PyDict_SetItemString(d,"wxWINDOW_VARIANT_NORMAL", SWIG_From_int((int)(wxWINDOW_VARIANT_NORMAL))); 
+        PyDict_SetItemString(d,"WINDOW_VARIANT_NORMAL", SWIG_From_int((int)(wxWINDOW_VARIANT_NORMAL))); 
     }
     {
-        PyDict_SetItemString(d,"wxWINDOW_VARIANT_SMALL", SWIG_From_int((int)(wxWINDOW_VARIANT_SMALL))); 
+        PyDict_SetItemString(d,"WINDOW_VARIANT_SMALL", SWIG_From_int((int)(wxWINDOW_VARIANT_SMALL))); 
     }
     {
-        PyDict_SetItemString(d,"wxWINDOW_VARIANT_MINI", SWIG_From_int((int)(wxWINDOW_VARIANT_MINI))); 
+        PyDict_SetItemString(d,"WINDOW_VARIANT_MINI", SWIG_From_int((int)(wxWINDOW_VARIANT_MINI))); 
     }
     {
-        PyDict_SetItemString(d,"wxWINDOW_VARIANT_LARGE", SWIG_From_int((int)(wxWINDOW_VARIANT_LARGE))); 
+        PyDict_SetItemString(d,"WINDOW_VARIANT_LARGE", SWIG_From_int((int)(wxWINDOW_VARIANT_LARGE))); 
     }
     {
-        PyDict_SetItemString(d,"wxWINDOW_VARIANT_MAX", SWIG_From_int((int)(wxWINDOW_VARIANT_MAX))); 
+        PyDict_SetItemString(d,"WINDOW_VARIANT_MAX", SWIG_From_int((int)(wxWINDOW_VARIANT_MAX))); 
     }
-    SWIG_addvarlink(SWIG_globals,(char*)"wxDefaultValidator",_wrap_wxDefaultValidator_get, _wrap_wxDefaultValidator_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"DefaultValidator",_wrap_DefaultValidator_get, _wrap_DefaultValidator_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ControlNameStr",_wrap_ControlNameStr_get, _wrap_ControlNameStr_set);
     {
-        PyDict_SetItemString(d,"wxFLEX_GROWMODE_NONE", SWIG_From_int((int)(wxFLEX_GROWMODE_NONE))); 
+        PyDict_SetItemString(d,"FLEX_GROWMODE_NONE", SWIG_From_int((int)(wxFLEX_GROWMODE_NONE))); 
     }
     {
-        PyDict_SetItemString(d,"wxFLEX_GROWMODE_SPECIFIED", SWIG_From_int((int)(wxFLEX_GROWMODE_SPECIFIED))); 
+        PyDict_SetItemString(d,"FLEX_GROWMODE_SPECIFIED", SWIG_From_int((int)(wxFLEX_GROWMODE_SPECIFIED))); 
     }
     {
-        PyDict_SetItemString(d,"wxFLEX_GROWMODE_ALL", SWIG_From_int((int)(wxFLEX_GROWMODE_ALL))); 
+        PyDict_SetItemString(d,"FLEX_GROWMODE_ALL", SWIG_From_int((int)(wxFLEX_GROWMODE_ALL))); 
     }
-    SWIG_addvarlink(SWIG_globals,(char*)"wxDefaultSpan",_wrap_wxDefaultSpan_get, _wrap_wxDefaultSpan_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"DefaultSpan",_wrap_DefaultSpan_get, _wrap_DefaultSpan_set);
     {
-        PyDict_SetItemString(d,"wxLeft", SWIG_From_int((int)(wxLeft))); 
+        PyDict_SetItemString(d,"Left", SWIG_From_int((int)(wxLeft))); 
     }
     {
-        PyDict_SetItemString(d,"wxTop", SWIG_From_int((int)(wxTop))); 
+        PyDict_SetItemString(d,"Top", SWIG_From_int((int)(wxTop))); 
     }
     {
-        PyDict_SetItemString(d,"wxRight", SWIG_From_int((int)(wxRight))); 
+        PyDict_SetItemString(d,"Right", SWIG_From_int((int)(wxRight))); 
     }
     {
-        PyDict_SetItemString(d,"wxBottom", SWIG_From_int((int)(wxBottom))); 
+        PyDict_SetItemString(d,"Bottom", SWIG_From_int((int)(wxBottom))); 
     }
     {
-        PyDict_SetItemString(d,"wxWidth", SWIG_From_int((int)(wxWidth))); 
+        PyDict_SetItemString(d,"Width", SWIG_From_int((int)(wxWidth))); 
     }
     {
-        PyDict_SetItemString(d,"wxHeight", SWIG_From_int((int)(wxHeight))); 
+        PyDict_SetItemString(d,"Height", SWIG_From_int((int)(wxHeight))); 
     }
     {
-        PyDict_SetItemString(d,"wxCentre", SWIG_From_int((int)(wxCentre))); 
+        PyDict_SetItemString(d,"Centre", SWIG_From_int((int)(wxCentre))); 
     }
     {
-        PyDict_SetItemString(d,"wxCenter", SWIG_From_int((int)(wxCenter))); 
+        PyDict_SetItemString(d,"Center", SWIG_From_int((int)(wxCenter))); 
     }
     {
-        PyDict_SetItemString(d,"wxCentreX", SWIG_From_int((int)(wxCentreX))); 
+        PyDict_SetItemString(d,"CentreX", SWIG_From_int((int)(wxCentreX))); 
     }
     {
-        PyDict_SetItemString(d,"wxCentreY", SWIG_From_int((int)(wxCentreY))); 
+        PyDict_SetItemString(d,"CentreY", SWIG_From_int((int)(wxCentreY))); 
     }
     {
-        PyDict_SetItemString(d,"wxUnconstrained", SWIG_From_int((int)(wxUnconstrained))); 
+        PyDict_SetItemString(d,"Unconstrained", SWIG_From_int((int)(wxUnconstrained))); 
     }
     {
-        PyDict_SetItemString(d,"wxAsIs", SWIG_From_int((int)(wxAsIs))); 
+        PyDict_SetItemString(d,"AsIs", SWIG_From_int((int)(wxAsIs))); 
     }
     {
-        PyDict_SetItemString(d,"wxPercentOf", SWIG_From_int((int)(wxPercentOf))); 
+        PyDict_SetItemString(d,"PercentOf", SWIG_From_int((int)(wxPercentOf))); 
     }
     {
-        PyDict_SetItemString(d,"wxAbove", SWIG_From_int((int)(wxAbove))); 
+        PyDict_SetItemString(d,"Above", SWIG_From_int((int)(wxAbove))); 
     }
     {
-        PyDict_SetItemString(d,"wxBelow", SWIG_From_int((int)(wxBelow))); 
+        PyDict_SetItemString(d,"Below", SWIG_From_int((int)(wxBelow))); 
     }
     {
-        PyDict_SetItemString(d,"wxLeftOf", SWIG_From_int((int)(wxLeftOf))); 
+        PyDict_SetItemString(d,"LeftOf", SWIG_From_int((int)(wxLeftOf))); 
     }
     {
-        PyDict_SetItemString(d,"wxRightOf", SWIG_From_int((int)(wxRightOf))); 
+        PyDict_SetItemString(d,"RightOf", SWIG_From_int((int)(wxRightOf))); 
     }
     {
-        PyDict_SetItemString(d,"wxSameAs", SWIG_From_int((int)(wxSameAs))); 
+        PyDict_SetItemString(d,"SameAs", SWIG_From_int((int)(wxSameAs))); 
     }
     {
-        PyDict_SetItemString(d,"wxAbsolute", SWIG_From_int((int)(wxAbsolute))); 
+        PyDict_SetItemString(d,"Absolute", SWIG_From_int((int)(wxAbsolute))); 
     }
     
     // Initialize threading, some globals and such