Applied patch #1441370: lib.plot - allow passing in wx.Colour()

[wxWidgets.git] / wxPython / src / msw / _windows_wrap.cpp

diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp
index 728cc6eb6eea25d1d9ff0aad74087fdb0e163aeb..b2c52997ab5acb12a4bfd3b647d810faa0425b75 100644 (file)
--- a/wxPython/src/msw/_windows_wrap.cpp
+++ b/wxPython/src/msw/_windows_wrap.cpp
@@ -1652,7 +1652,7 @@ SWIG_AsVal_long(PyObject* obj, long* val)
         return 1;
     }
     else {
-        SWIG_type_error("number", obj);
+        SWIG_Python_TypeError("number", obj);
     }
     return 0;
 }
@@ -1776,36 +1776,35 @@ SWIG_Check_bool(PyObject* obj)
 }
 
 
-  /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
+  /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
 #define SWIG_From_int PyInt_FromLong
 /*@@*/
 
 
-  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
-    PyObject*   o2;
-    PyObject*   o3;
-    
-    if (!target) {                   
-        target = o;
-    } else if (target == Py_None) {  
-        Py_DECREF(Py_None);
-        target = o;
-    } else {
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }            
-        o3 = PyTuple_New(1);            
-        PyTuple_SetItem(o3, 0, o);      
-
-        o2 = target;
-        target = PySequence_Concat(o2, o3); 
-        Py_DECREF(o2);                      
-        Py_DECREF(o3);
-    }
-    return target;
-  }
+    static PyObject* t_output_helper(PyObject* result, PyObject* obj)
+    {
+        PyObject*   o2;
+        PyObject*   o3;
+        if (!result) {
+            result = obj;
+        } else if (result == Py_None) {
+            Py_DECREF(result);
+            result = obj;
+        } else {
+            if (!PyTuple_Check(result)) {
+                o2 = result;
+                result = PyTuple_New(1);
+                PyTuple_SET_ITEM(result, 0, o2);
+            }
+            o3 = PyTuple_New(1);            
+            PyTuple_SetItem(o3, 0, obj);      
+            o2 = result;
+            result = PySequence_Concat(o2, o3); 
+            Py_DECREF(o2);                      
+            Py_DECREF(o3);
+        }
+        return result;
+    }
 
 
 
@@ -1817,7 +1816,7 @@ SWIG_AsVal_double(PyObject *obj, double* val)
         return 1;
     }
     else {
-        SWIG_type_error("number", obj);
+        SWIG_Python_TypeError("number", obj);
     }
     return 0;
 }
@@ -1844,7 +1843,7 @@ SWIG_Check_double(PyObject* obj)
 }
 
 
-  /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
+  /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
 #define SWIG_From_double PyFloat_FromDouble
 /*@@*/
 
@@ -1855,7 +1854,7 @@ SWIG_Check_double(PyObject* obj)
 static void wxTopLevelWindow_MacSetMetalAppearance(wxTopLevelWindow *self,bool on){ /*wxPyRaiseNotImplemented();*/ }
 static bool wxTopLevelWindow_MacGetMetalAppearance(wxTopLevelWindow const *self){ /*wxPyRaiseNotImplemented();*/ return false; }
 
-  /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
+  /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
 #define SWIG_From_long PyInt_FromLong
 /*@@*/
 
@@ -1982,7 +1981,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)
 {
     long v = 0;
     if (SWIG_AsVal_long(obj, &v) && v < 0) {
-        SWIG_type_error("unsigned number", obj);
+        SWIG_Python_TypeError("unsigned number", obj);
     }
     else if (val)
         *val = (unsigned long)v;
@@ -2605,9 +2604,6 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p
         wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo);
 }
 
-void wxPyPrintout::base_GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) {
-    wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo);
-}
 
 
 IMP_PYCALLBACK_BOOL_INTINT(wxPyPrintout, wxPrintout, OnBeginDocument);
@@ -2623,8 +2619,7 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage);
 
 
 #define DEC_PYCALLBACK_BOOL_PREWINDC(CBNAME)                                            \
-    bool CBNAME(wxPreviewCanvas* a, wxDC& b);                                           \
-    bool base_##CBNAME(wxPreviewCanvas* a, wxDC& b)
+    bool CBNAME(wxPreviewCanvas* a, wxDC& b)
 
 
 #define IMP_PYCALLBACK_BOOL_PREWINDC(CLASS, PCLASS, CBNAME)                             \
@@ -2643,10 +2638,7 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage);
         if (! found)                                                                    \
             rval = PCLASS::CBNAME(a, b);                                                \
         return rval;                                                                    \
-    }                                                                                   \
-    bool CLASS::base_##CBNAME(wxPreviewCanvas* a, wxDC& b) {                            \
-        return PCLASS::CBNAME(a, b);                                                    \
-    }
+    }                                       
 
 
 
@@ -4836,6 +4828,39 @@ static PyObject *_wrap_TopLevelWindow_MacGetMetalAppearance(PyObject *, PyObject
 }
 
 
+static PyObject *_wrap_TopLevelWindow_CenterOnScreen(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj = NULL;
+    wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
+    int arg2 = (int) wxBOTH ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "dir", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TopLevelWindow_CenterOnScreen",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTopLevelWindow, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    if (obj1) {
+        {
+            arg2 = static_cast<int >(SWIG_As_int(obj1)); 
+            if (SWIG_arg_fail(2)) SWIG_fail;
+        }
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->CenterOnScreen(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject * TopLevelWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
@@ -5274,7 +5299,7 @@ static PyObject *_wrap_Frame_CreateStatusBar(PyObject *, PyObject *args, PyObjec
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 0); 
+        resultobj = wxPyMake_wxObject(result, (bool)0); 
     }
     {
         if (temp5)
@@ -5310,7 +5335,7 @@ static PyObject *_wrap_Frame_GetStatusBar(PyObject *, PyObject *args, PyObject *
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 0); 
+        resultobj = wxPyMake_wxObject(result, (bool)0); 
     }
     return resultobj;
     fail:
@@ -5623,7 +5648,7 @@ static PyObject *_wrap_Frame_CreateToolBar(PyObject *, PyObject *args, PyObject
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 0); 
+        resultobj = wxPyMake_wxObject(result, (bool)0); 
     }
     {
         if (temp4)
@@ -5659,7 +5684,7 @@ static PyObject *_wrap_Frame_GetToolBar(PyObject *, PyObject *args, PyObject *kw
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 0); 
+        resultobj = wxPyMake_wxObject(result, (bool)0); 
     }
     return resultobj;
     fail:
@@ -6105,6 +6130,124 @@ static PyObject *_wrap_Dialog_GetReturnCode(PyObject *, PyObject *args, PyObject
 }
 
 
+static PyObject *_wrap_Dialog_SetAffirmativeId(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj = NULL;
+    wxDialog *arg1 = (wxDialog *) 0 ;
+    int arg2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "affirmativeId", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_SetAffirmativeId",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDialog, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = static_cast<int >(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetAffirmativeId(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Dialog_GetAffirmativeId(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj = NULL;
+    wxDialog *arg1 = (wxDialog *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Dialog_GetAffirmativeId",kwnames,&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDialog, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (int)((wxDialog const *)arg1)->GetAffirmativeId();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = SWIG_From_int(static_cast<int >(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Dialog_SetEscapeId(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj = NULL;
+    wxDialog *arg1 = (wxDialog *) 0 ;
+    int arg2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "escapeId", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_SetEscapeId",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDialog, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = static_cast<int >(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetEscapeId(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Dialog_GetEscapeId(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj = NULL;
+    wxDialog *arg1 = (wxDialog *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Dialog_GetEscapeId",kwnames,&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDialog, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (int)((wxDialog const *)arg1)->GetEscapeId();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = SWIG_From_int(static_cast<int >(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_Dialog_CreateTextSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxDialog *arg1 = (wxDialog *) 0 ;
@@ -6133,7 +6276,7 @@ static PyObject *_wrap_Dialog_CreateTextSizer(PyObject *, PyObject *args, PyObje
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 0); 
+        resultobj = wxPyMake_wxObject(result, (bool)0); 
     }
     {
         if (temp2)
@@ -6191,7 +6334,7 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *, PyObject *args, PyOb
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 0); 
+        resultobj = wxPyMake_wxObject(result, (bool)0); 
     }
     return resultobj;
     fail:
@@ -13198,6 +13341,31 @@ static PyObject *_wrap_new_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
+static PyObject *_wrap_delete_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj = NULL;
+    wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_TaskBarIcon",kwnames,&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        delete arg1;
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_TaskBarIcon__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
@@ -17554,7 +17722,7 @@ static PyObject *_wrap_MDIParentFrame_GetActiveChild(PyObject *, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 0); 
+        resultobj = wxPyMake_wxObject(result, (bool)0); 
     }
     return resultobj;
     fail:
@@ -17582,7 +17750,7 @@ static PyObject *_wrap_MDIParentFrame_GetClientWindow(PyObject *, PyObject *args
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 0); 
+        resultobj = wxPyMake_wxObject(result, (bool)0); 
     }
     return resultobj;
     fail:
@@ -18369,7 +18537,7 @@ static PyObject *_wrap_PyWindow_DoEraseBackground(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int arg2 ;
@@ -18385,7 +18553,7 @@ static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *, PyObject *args, Py
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWindow_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWindow_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18406,7 +18574,7 @@ static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *, PyObject *args, Py
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5);
+        (arg1)->DoMoveWindow(arg2,arg3,arg4,arg5);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18418,7 +18586,7 @@ static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int arg2 ;
@@ -18436,7 +18604,7 @@ static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *, PyObject *args, PyObj
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWindow_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWindow_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18463,7 +18631,7 @@ static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *, PyObject *args, PyObj
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6);
+        (arg1)->DoSetSize(arg2,arg3,arg4,arg5,arg6);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18475,7 +18643,7 @@ static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int arg2 ;
@@ -18487,7 +18655,7 @@ static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *, PyObject *args,
         (char *) "self",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18500,7 +18668,7 @@ static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *, PyObject *args,
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_DoSetClientSize(arg2,arg3);
+        (arg1)->DoSetClientSize(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18512,7 +18680,7 @@ static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int arg2 ;
@@ -18524,7 +18692,7 @@ static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *, PyObject *args
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -18537,7 +18705,7 @@ static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *, PyObject *args
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_DoSetVirtualSize(arg2,arg3);
+        (arg1)->DoSetVirtualSize(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18549,7 +18717,7 @@ static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -18565,12 +18733,12 @@ static PyObject *_wrap_PyWindow_base_DoGetSize(PyObject *, PyObject *args, PyObj
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_DoGetSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_DoGetSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        ((wxPyWindow const *)arg1)->base_DoGetSize(arg2,arg3);
+        ((wxPyWindow const *)arg1)->DoGetSize(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18586,7 +18754,7 @@ static PyObject *_wrap_PyWindow_base_DoGetSize(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -18602,12 +18770,12 @@ static PyObject *_wrap_PyWindow_base_DoGetClientSize(PyObject *, PyObject *args,
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_DoGetClientSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_DoGetClientSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        ((wxPyWindow const *)arg1)->base_DoGetClientSize(arg2,arg3);
+        ((wxPyWindow const *)arg1)->DoGetClientSize(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18623,7 +18791,7 @@ static PyObject *_wrap_PyWindow_base_DoGetClientSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -18639,12 +18807,12 @@ static PyObject *_wrap_PyWindow_base_DoGetPosition(PyObject *, PyObject *args, P
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_DoGetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_DoGetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        ((wxPyWindow const *)arg1)->base_DoGetPosition(arg2,arg3);
+        ((wxPyWindow const *)arg1)->DoGetPosition(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18660,7 +18828,7 @@ static PyObject *_wrap_PyWindow_base_DoGetPosition(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxSize result;
@@ -18669,12 +18837,12 @@ static PyObject *_wrap_PyWindow_base_DoGetVirtualSize(PyObject *, PyObject *args
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_DoGetVirtualSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_DoGetVirtualSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxPyWindow const *)arg1)->base_DoGetVirtualSize();
+        result = ((wxPyWindow const *)arg1)->DoGetVirtualSize();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18690,7 +18858,7 @@ static PyObject *_wrap_PyWindow_base_DoGetVirtualSize(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxSize result;
@@ -18699,12 +18867,12 @@ static PyObject *_wrap_PyWindow_base_DoGetBestSize(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_DoGetBestSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_DoGetBestSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxPyWindow const *)arg1)->base_DoGetBestSize();
+        result = ((wxPyWindow const *)arg1)->DoGetBestSize();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18720,7 +18888,7 @@ static PyObject *_wrap_PyWindow_base_DoGetBestSize(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyWindow_base_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -18728,12 +18896,12 @@ static PyObject *_wrap_PyWindow_base_InitDialog(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_InitDialog",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_InitDialog",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_InitDialog();
+        (arg1)->InitDialog();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18745,7 +18913,7 @@ static PyObject *_wrap_PyWindow_base_InitDialog(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyWindow_base_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     bool result;
@@ -18754,12 +18922,12 @@ static PyObject *_wrap_PyWindow_base_TransferDataToWindow(PyObject *, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_TransferDataToWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_TransferDataToWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_TransferDataToWindow();
+        result = (bool)(arg1)->TransferDataToWindow();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18773,7 +18941,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataToWindow(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyWindow_base_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     bool result;
@@ -18782,12 +18950,12 @@ static PyObject *_wrap_PyWindow_base_TransferDataFromWindow(PyObject *, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_TransferDataFromWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_TransferDataFromWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_TransferDataFromWindow();
+        result = (bool)(arg1)->TransferDataFromWindow();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18801,7 +18969,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataFromWindow(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyWindow_base_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     bool result;
@@ -18810,12 +18978,12 @@ static PyObject *_wrap_PyWindow_base_Validate(PyObject *, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_Validate",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_Validate",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_Validate();
+        result = (bool)(arg1)->Validate();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18829,7 +18997,7 @@ static PyObject *_wrap_PyWindow_base_Validate(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyWindow_base_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     bool result;
@@ -18838,12 +19006,12 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocus(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_AcceptsFocus",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_AcceptsFocus",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxPyWindow const *)arg1)->base_AcceptsFocus();
+        result = (bool)((wxPyWindow const *)arg1)->AcceptsFocus();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18857,7 +19025,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocus(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyWindow_base_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     bool result;
@@ -18866,12 +19034,12 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocusFromKeyboard(PyObject *, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxPyWindow const *)arg1)->base_AcceptsFocusFromKeyboard();
+        result = (bool)((wxPyWindow const *)arg1)->AcceptsFocusFromKeyboard();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18885,7 +19053,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocusFromKeyboard(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyWindow_base_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxSize result;
@@ -18894,12 +19062,12 @@ static PyObject *_wrap_PyWindow_base_GetMaxSize(PyObject *, PyObject *args, PyOb
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_GetMaxSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_GetMaxSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxPyWindow const *)arg1)->base_GetMaxSize();
+        result = ((wxPyWindow const *)arg1)->GetMaxSize();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18915,7 +19083,7 @@ static PyObject *_wrap_PyWindow_base_GetMaxSize(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyWindow_base_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -18925,14 +19093,14 @@ static PyObject *_wrap_PyWindow_base_AddChild(PyObject *, PyObject *args, PyObje
         (char *) "self",(char *) "child", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWindow_base_AddChild",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWindow_AddChild",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_AddChild(arg2);
+        (arg1)->AddChild(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18944,7 +19112,7 @@ static PyObject *_wrap_PyWindow_base_AddChild(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyWindow_base_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -18954,14 +19122,14 @@ static PyObject *_wrap_PyWindow_base_RemoveChild(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "child", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWindow_base_RemoveChild",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWindow_RemoveChild",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_RemoveChild(arg2);
+        (arg1)->RemoveChild(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -18973,7 +19141,7 @@ static PyObject *_wrap_PyWindow_base_RemoveChild(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyWindow_base_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     bool result;
@@ -18982,12 +19150,12 @@ static PyObject *_wrap_PyWindow_base_ShouldInheritColours(PyObject *, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_ShouldInheritColours",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_ShouldInheritColours",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxPyWindow const *)arg1)->base_ShouldInheritColours();
+        result = (bool)((wxPyWindow const *)arg1)->ShouldInheritColours();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19001,7 +19169,7 @@ static PyObject *_wrap_PyWindow_base_ShouldInheritColours(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyWindow_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxVisualAttributes result;
@@ -19010,12 +19178,12 @@ static PyObject *_wrap_PyWindow_base_GetDefaultAttributes(PyObject *, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_GetDefaultAttributes",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_GetDefaultAttributes",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (arg1)->base_GetDefaultAttributes();
+        result = (arg1)->GetDefaultAttributes();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19031,7 +19199,7 @@ static PyObject *_wrap_PyWindow_base_GetDefaultAttributes(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyWindow_base_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19039,12 +19207,12 @@ static PyObject *_wrap_PyWindow_base_OnInternalIdle(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_OnInternalIdle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_OnInternalIdle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_OnInternalIdle();
+        (arg1)->OnInternalIdle();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19263,7 +19431,7 @@ static PyObject *_wrap_PyPanel_DoEraseBackground(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int arg2 ;
@@ -19279,7 +19447,7 @@ static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyPanel_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyPanel_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19300,7 +19468,7 @@ static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *, PyObject *args, PyO
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5);
+        (arg1)->DoMoveWindow(arg2,arg3,arg4,arg5);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19312,7 +19480,7 @@ static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int arg2 ;
@@ -19330,7 +19498,7 @@ static PyObject *_wrap_PyPanel_base_DoSetSize(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:PyPanel_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyPanel_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19357,7 +19525,7 @@ static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *, PyObject *args, PyObje
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6);
+        (arg1)->DoSetSize(arg2,arg3,arg4,arg5,arg6);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19369,7 +19537,7 @@ static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int arg2 ;
@@ -19381,7 +19549,7 @@ static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *, PyObject *args,
         (char *) "self",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19394,7 +19562,7 @@ static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *, PyObject *args,
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_DoSetClientSize(arg2,arg3);
+        (arg1)->DoSetClientSize(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19406,7 +19574,7 @@ static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int arg2 ;
@@ -19418,7 +19586,7 @@ static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *, PyObject *args,
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -19431,7 +19599,7 @@ static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *, PyObject *args,
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_DoSetVirtualSize(arg2,arg3);
+        (arg1)->DoSetVirtualSize(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19443,7 +19611,7 @@ static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -19459,12 +19627,12 @@ static PyObject *_wrap_PyPanel_base_DoGetSize(PyObject *, PyObject *args, PyObje
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_DoGetSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_DoGetSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        ((wxPyPanel const *)arg1)->base_DoGetSize(arg2,arg3);
+        ((wxPyPanel const *)arg1)->DoGetSize(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19480,7 +19648,7 @@ static PyObject *_wrap_PyPanel_base_DoGetSize(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -19496,12 +19664,12 @@ static PyObject *_wrap_PyPanel_base_DoGetClientSize(PyObject *, PyObject *args,
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_DoGetClientSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_DoGetClientSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        ((wxPyPanel const *)arg1)->base_DoGetClientSize(arg2,arg3);
+        ((wxPyPanel const *)arg1)->DoGetClientSize(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19517,7 +19685,7 @@ static PyObject *_wrap_PyPanel_base_DoGetClientSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -19533,12 +19701,12 @@ static PyObject *_wrap_PyPanel_base_DoGetPosition(PyObject *, PyObject *args, Py
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_DoGetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_DoGetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        ((wxPyPanel const *)arg1)->base_DoGetPosition(arg2,arg3);
+        ((wxPyPanel const *)arg1)->DoGetPosition(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19554,7 +19722,7 @@ static PyObject *_wrap_PyPanel_base_DoGetPosition(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxSize result;
@@ -19563,12 +19731,12 @@ static PyObject *_wrap_PyPanel_base_DoGetVirtualSize(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_DoGetVirtualSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_DoGetVirtualSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxPyPanel const *)arg1)->base_DoGetVirtualSize();
+        result = ((wxPyPanel const *)arg1)->DoGetVirtualSize();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19584,7 +19752,7 @@ static PyObject *_wrap_PyPanel_base_DoGetVirtualSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxSize result;
@@ -19593,12 +19761,12 @@ static PyObject *_wrap_PyPanel_base_DoGetBestSize(PyObject *, PyObject *args, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_DoGetBestSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_DoGetBestSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxPyPanel const *)arg1)->base_DoGetBestSize();
+        result = ((wxPyPanel const *)arg1)->DoGetBestSize();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19614,7 +19782,7 @@ static PyObject *_wrap_PyPanel_base_DoGetBestSize(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyPanel_base_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19622,12 +19790,12 @@ static PyObject *_wrap_PyPanel_base_InitDialog(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_InitDialog",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_InitDialog",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_InitDialog();
+        (arg1)->InitDialog();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19639,7 +19807,7 @@ static PyObject *_wrap_PyPanel_base_InitDialog(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyPanel_base_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     bool result;
@@ -19648,12 +19816,12 @@ static PyObject *_wrap_PyPanel_base_TransferDataToWindow(PyObject *, PyObject *a
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_TransferDataToWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_TransferDataToWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_TransferDataToWindow();
+        result = (bool)(arg1)->TransferDataToWindow();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19667,7 +19835,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataToWindow(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyPanel_base_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     bool result;
@@ -19676,12 +19844,12 @@ static PyObject *_wrap_PyPanel_base_TransferDataFromWindow(PyObject *, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_TransferDataFromWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_TransferDataFromWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_TransferDataFromWindow();
+        result = (bool)(arg1)->TransferDataFromWindow();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19695,7 +19863,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataFromWindow(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyPanel_base_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     bool result;
@@ -19704,12 +19872,12 @@ static PyObject *_wrap_PyPanel_base_Validate(PyObject *, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_Validate",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_Validate",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_Validate();
+        result = (bool)(arg1)->Validate();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19723,7 +19891,7 @@ static PyObject *_wrap_PyPanel_base_Validate(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyPanel_base_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     bool result;
@@ -19732,12 +19900,12 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocus(PyObject *, PyObject *args, PyO
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_AcceptsFocus",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_AcceptsFocus",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxPyPanel const *)arg1)->base_AcceptsFocus();
+        result = (bool)((wxPyPanel const *)arg1)->AcceptsFocus();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19751,7 +19919,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocus(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyPanel_base_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     bool result;
@@ -19760,12 +19928,12 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocusFromKeyboard(PyObject *, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxPyPanel const *)arg1)->base_AcceptsFocusFromKeyboard();
+        result = (bool)((wxPyPanel const *)arg1)->AcceptsFocusFromKeyboard();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19779,7 +19947,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocusFromKeyboard(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyPanel_base_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxSize result;
@@ -19788,12 +19956,12 @@ static PyObject *_wrap_PyPanel_base_GetMaxSize(PyObject *, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_GetMaxSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_GetMaxSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxPyPanel const *)arg1)->base_GetMaxSize();
+        result = ((wxPyPanel const *)arg1)->GetMaxSize();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19809,7 +19977,7 @@ static PyObject *_wrap_PyPanel_base_GetMaxSize(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyPanel_base_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -19819,14 +19987,14 @@ static PyObject *_wrap_PyPanel_base_AddChild(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "child", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPanel_base_AddChild",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPanel_AddChild",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_AddChild(arg2);
+        (arg1)->AddChild(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19838,7 +20006,7 @@ static PyObject *_wrap_PyPanel_base_AddChild(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyPanel_base_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -19848,14 +20016,14 @@ static PyObject *_wrap_PyPanel_base_RemoveChild(PyObject *, PyObject *args, PyOb
         (char *) "self",(char *) "child", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPanel_base_RemoveChild",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPanel_RemoveChild",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_RemoveChild(arg2);
+        (arg1)->RemoveChild(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19867,7 +20035,7 @@ static PyObject *_wrap_PyPanel_base_RemoveChild(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyPanel_base_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     bool result;
@@ -19876,12 +20044,12 @@ static PyObject *_wrap_PyPanel_base_ShouldInheritColours(PyObject *, PyObject *a
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_ShouldInheritColours",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_ShouldInheritColours",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxPyPanel const *)arg1)->base_ShouldInheritColours();
+        result = (bool)((wxPyPanel const *)arg1)->ShouldInheritColours();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19895,7 +20063,7 @@ static PyObject *_wrap_PyPanel_base_ShouldInheritColours(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyPanel_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxVisualAttributes result;
@@ -19904,12 +20072,12 @@ static PyObject *_wrap_PyPanel_base_GetDefaultAttributes(PyObject *, PyObject *a
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_GetDefaultAttributes",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_GetDefaultAttributes",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (arg1)->base_GetDefaultAttributes();
+        result = (arg1)->GetDefaultAttributes();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19925,7 +20093,7 @@ static PyObject *_wrap_PyPanel_base_GetDefaultAttributes(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyPanel_base_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19933,12 +20101,12 @@ static PyObject *_wrap_PyPanel_base_OnInternalIdle(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_OnInternalIdle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_OnInternalIdle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_OnInternalIdle();
+        (arg1)->OnInternalIdle();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20157,7 +20325,7 @@ static PyObject *_wrap_PyScrolledWindow_DoEraseBackground(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int arg2 ;
@@ -20173,7 +20341,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoMoveWindow(PyObject *, PyObject *
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyScrolledWindow_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyScrolledWindow_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20194,7 +20362,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoMoveWindow(PyObject *, PyObject *
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5);
+        (arg1)->DoMoveWindow(arg2,arg3,arg4,arg5);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20206,7 +20374,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoMoveWindow(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int arg2 ;
@@ -20224,7 +20392,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetSize(PyObject *, PyObject *arg
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyScrolledWindow_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyScrolledWindow_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20251,7 +20419,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetSize(PyObject *, PyObject *arg
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6);
+        (arg1)->DoSetSize(arg2,arg3,arg4,arg5,arg6);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20263,7 +20431,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetSize(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int arg2 ;
@@ -20275,7 +20443,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetClientSize(PyObject *, PyObjec
         (char *) "self",(char *) "width",(char *) "height", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20288,7 +20456,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetClientSize(PyObject *, PyObjec
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_DoSetClientSize(arg2,arg3);
+        (arg1)->DoSetClientSize(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20300,7 +20468,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetClientSize(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int arg2 ;
@@ -20312,7 +20480,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetVirtualSize(PyObject *, PyObje
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -20325,7 +20493,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetVirtualSize(PyObject *, PyObje
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_DoSetVirtualSize(arg2,arg3);
+        (arg1)->DoSetVirtualSize(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20337,7 +20505,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetVirtualSize(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -20353,12 +20521,12 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetSize(PyObject *, PyObject *arg
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_DoGetSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_DoGetSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        ((wxPyScrolledWindow const *)arg1)->base_DoGetSize(arg2,arg3);
+        ((wxPyScrolledWindow const *)arg1)->DoGetSize(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20374,7 +20542,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetSize(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -20390,12 +20558,12 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetClientSize(PyObject *, PyObjec
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_DoGetClientSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_DoGetClientSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        ((wxPyScrolledWindow const *)arg1)->base_DoGetClientSize(arg2,arg3);
+        ((wxPyScrolledWindow const *)arg1)->DoGetClientSize(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20411,7 +20579,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetClientSize(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -20427,12 +20595,12 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetPosition(PyObject *, PyObject
     
     arg2 = &temp2; res2 = SWIG_NEWOBJ;
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_DoGetPosition",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_DoGetPosition",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        ((wxPyScrolledWindow const *)arg1)->base_DoGetPosition(arg2,arg3);
+        ((wxPyScrolledWindow const *)arg1)->DoGetPosition(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20448,7 +20616,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetPosition(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxSize result;
@@ -20457,12 +20625,12 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetVirtualSize(PyObject *, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_DoGetVirtualSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_DoGetVirtualSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxPyScrolledWindow const *)arg1)->base_DoGetVirtualSize();
+        result = ((wxPyScrolledWindow const *)arg1)->DoGetVirtualSize();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20478,7 +20646,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetVirtualSize(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxSize result;
@@ -20487,12 +20655,12 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetBestSize(PyObject *, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_DoGetBestSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_DoGetBestSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxPyScrolledWindow const *)arg1)->base_DoGetBestSize();
+        result = ((wxPyScrolledWindow const *)arg1)->DoGetBestSize();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20508,7 +20676,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetBestSize(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -20516,12 +20684,12 @@ static PyObject *_wrap_PyScrolledWindow_base_InitDialog(PyObject *, PyObject *ar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_InitDialog",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_InitDialog",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_InitDialog();
+        (arg1)->InitDialog();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20533,7 +20701,7 @@ static PyObject *_wrap_PyScrolledWindow_base_InitDialog(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     bool result;
@@ -20542,12 +20710,12 @@ static PyObject *_wrap_PyScrolledWindow_base_TransferDataToWindow(PyObject *, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_TransferDataToWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_TransferDataToWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_TransferDataToWindow();
+        result = (bool)(arg1)->TransferDataToWindow();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20561,7 +20729,7 @@ static PyObject *_wrap_PyScrolledWindow_base_TransferDataToWindow(PyObject *, Py
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     bool result;
@@ -20570,12 +20738,12 @@ static PyObject *_wrap_PyScrolledWindow_base_TransferDataFromWindow(PyObject *,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_TransferDataFromWindow",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_TransferDataFromWindow",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_TransferDataFromWindow();
+        result = (bool)(arg1)->TransferDataFromWindow();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20589,7 +20757,7 @@ static PyObject *_wrap_PyScrolledWindow_base_TransferDataFromWindow(PyObject *,
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     bool result;
@@ -20598,12 +20766,12 @@ static PyObject *_wrap_PyScrolledWindow_base_Validate(PyObject *, PyObject *args
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_Validate",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_Validate",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_Validate();
+        result = (bool)(arg1)->Validate();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20617,7 +20785,7 @@ static PyObject *_wrap_PyScrolledWindow_base_Validate(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     bool result;
@@ -20626,12 +20794,12 @@ static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocus(PyObject *, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_AcceptsFocus",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_AcceptsFocus",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxPyScrolledWindow const *)arg1)->base_AcceptsFocus();
+        result = (bool)((wxPyScrolledWindow const *)arg1)->AcceptsFocus();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20645,7 +20813,7 @@ static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocus(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     bool result;
@@ -20654,12 +20822,12 @@ static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocusFromKeyboard(PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxPyScrolledWindow const *)arg1)->base_AcceptsFocusFromKeyboard();
+        result = (bool)((wxPyScrolledWindow const *)arg1)->AcceptsFocusFromKeyboard();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20673,7 +20841,7 @@ static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocusFromKeyboard(PyObject *
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxSize result;
@@ -20682,12 +20850,12 @@ static PyObject *_wrap_PyScrolledWindow_base_GetMaxSize(PyObject *, PyObject *ar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_GetMaxSize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_GetMaxSize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxPyScrolledWindow const *)arg1)->base_GetMaxSize();
+        result = ((wxPyScrolledWindow const *)arg1)->GetMaxSize();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20703,7 +20871,7 @@ static PyObject *_wrap_PyScrolledWindow_base_GetMaxSize(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -20713,14 +20881,14 @@ static PyObject *_wrap_PyScrolledWindow_base_AddChild(PyObject *, PyObject *args
         (char *) "self",(char *) "child", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyScrolledWindow_base_AddChild",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyScrolledWindow_AddChild",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_AddChild(arg2);
+        (arg1)->AddChild(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20732,7 +20900,7 @@ static PyObject *_wrap_PyScrolledWindow_base_AddChild(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -20742,14 +20910,14 @@ static PyObject *_wrap_PyScrolledWindow_base_RemoveChild(PyObject *, PyObject *a
         (char *) "self",(char *) "child", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyScrolledWindow_base_RemoveChild",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyScrolledWindow_RemoveChild",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(2)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_RemoveChild(arg2);
+        (arg1)->RemoveChild(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20761,7 +20929,7 @@ static PyObject *_wrap_PyScrolledWindow_base_RemoveChild(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     bool result;
@@ -20770,12 +20938,12 @@ static PyObject *_wrap_PyScrolledWindow_base_ShouldInheritColours(PyObject *, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_ShouldInheritColours",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_ShouldInheritColours",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxPyScrolledWindow const *)arg1)->base_ShouldInheritColours();
+        result = (bool)((wxPyScrolledWindow const *)arg1)->ShouldInheritColours();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20789,7 +20957,7 @@ static PyObject *_wrap_PyScrolledWindow_base_ShouldInheritColours(PyObject *, Py
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxVisualAttributes result;
@@ -20798,12 +20966,12 @@ static PyObject *_wrap_PyScrolledWindow_base_GetDefaultAttributes(PyObject *, Py
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_GetDefaultAttributes",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_GetDefaultAttributes",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (arg1)->base_GetDefaultAttributes();
+        result = (arg1)->GetDefaultAttributes();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20819,7 +20987,7 @@ static PyObject *_wrap_PyScrolledWindow_base_GetDefaultAttributes(PyObject *, Py
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -20827,12 +20995,12 @@ static PyObject *_wrap_PyScrolledWindow_base_OnInternalIdle(PyObject *, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_OnInternalIdle",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_OnInternalIdle",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_OnInternalIdle();
+        (arg1)->OnInternalIdle();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -24179,7 +24347,7 @@ static PyObject *_wrap_PrintDialog_GetPrintDC(PyObject *, PyObject *args, PyObje
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 1); 
+        resultobj = wxPyMake_wxObject(result, (bool)1); 
     }
     return resultobj;
     fail:
@@ -24433,7 +24601,7 @@ static PyObject *_wrap_Printer_PrintDialog(PyObject *, PyObject *args, PyObject
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 0); 
+        resultobj = wxPyMake_wxObject(result, (bool)0); 
     }
     return resultobj;
     fail:
@@ -24555,7 +24723,7 @@ static PyObject *_wrap_new_Printout(PyObject *, PyObject *args, PyObject *kwargs
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 1); 
+        resultobj = wxPyMake_wxObject(result, (bool)1); 
     }
     {
         if (temp1)
@@ -24654,7 +24822,7 @@ static PyObject *_wrap_Printout_GetDC(PyObject *, PyObject *args, PyObject *kwar
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 0); 
+        resultobj = wxPyMake_wxObject(result, (bool)0); 
     }
     return resultobj;
     fail:
@@ -25046,7 +25214,7 @@ static PyObject *_wrap_Printout_SetIsPreview(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_OnBeginDocument(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int arg2 ;
@@ -25059,7 +25227,7 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *, PyObject *args,
         (char *) "self",(char *) "startPage",(char *) "endPage", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_base_OnBeginDocument",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_OnBeginDocument",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25072,7 +25240,7 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *, PyObject *args,
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_OnBeginDocument(arg2,arg3);
+        result = (bool)(arg1)->OnBeginDocument(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -25086,7 +25254,7 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_Printout_base_OnEndDocument(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_OnEndDocument(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     PyObject * obj0 = 0 ;
@@ -25094,12 +25262,12 @@ static PyObject *_wrap_Printout_base_OnEndDocument(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_base_OnEndDocument",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_OnEndDocument",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_OnEndDocument();
+        (arg1)->OnEndDocument();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -25111,7 +25279,7 @@ static PyObject *_wrap_Printout_base_OnEndDocument(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Printout_base_OnBeginPrinting(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_OnBeginPrinting(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     PyObject * obj0 = 0 ;
@@ -25119,12 +25287,12 @@ static PyObject *_wrap_Printout_base_OnBeginPrinting(PyObject *, PyObject *args,
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_base_OnBeginPrinting",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_OnBeginPrinting",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_OnBeginPrinting();
+        (arg1)->OnBeginPrinting();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -25136,7 +25304,7 @@ static PyObject *_wrap_Printout_base_OnBeginPrinting(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_Printout_base_OnEndPrinting(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_OnEndPrinting(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     PyObject * obj0 = 0 ;
@@ -25144,12 +25312,12 @@ static PyObject *_wrap_Printout_base_OnEndPrinting(PyObject *, PyObject *args, P
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_base_OnEndPrinting",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_OnEndPrinting",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_OnEndPrinting();
+        (arg1)->OnEndPrinting();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -25161,7 +25329,7 @@ static PyObject *_wrap_Printout_base_OnEndPrinting(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Printout_base_OnPreparePrinting(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_OnPreparePrinting(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     PyObject * obj0 = 0 ;
@@ -25169,12 +25337,12 @@ static PyObject *_wrap_Printout_base_OnPreparePrinting(PyObject *, PyObject *arg
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_base_OnPreparePrinting",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_OnPreparePrinting",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_OnPreparePrinting();
+        (arg1)->OnPreparePrinting();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -25186,7 +25354,7 @@ static PyObject *_wrap_Printout_base_OnPreparePrinting(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_Printout_base_HasPage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_HasPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int arg2 ;
@@ -25197,7 +25365,7 @@ static PyObject *_wrap_Printout_base_HasPage(PyObject *, PyObject *args, PyObjec
         (char *) "self",(char *) "page", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_base_HasPage",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_HasPage",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -25206,7 +25374,7 @@ static PyObject *_wrap_Printout_base_HasPage(PyObject *, PyObject *args, PyObjec
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_HasPage(arg2);
+        result = (bool)(arg1)->HasPage(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -25220,7 +25388,7 @@ static PyObject *_wrap_Printout_base_HasPage(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Printout_base_GetPageInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_GetPageInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -25244,12 +25412,12 @@ static PyObject *_wrap_Printout_base_GetPageInfo(PyObject *, PyObject *args, PyO
     arg3 = &temp3; res3 = SWIG_NEWOBJ;
     arg4 = &temp4; res4 = SWIG_NEWOBJ;
     arg5 = &temp5; res5 = SWIG_NEWOBJ;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_base_GetPageInfo",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_GetPageInfo",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_GetPageInfo(arg2,arg3,arg4,arg5);
+        (arg1)->GetPageInfo(arg2,arg3,arg4,arg5);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -26133,7 +26301,7 @@ static PyObject *_wrap_PrintPreview_GetPrintout(PyObject *, PyObject *args, PyOb
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 0); 
+        resultobj = wxPyMake_wxObject(result, (bool)0); 
     }
     return resultobj;
     fail:
@@ -26161,7 +26329,7 @@ static PyObject *_wrap_PrintPreview_GetPrintoutForPrinting(PyObject *, PyObject
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
-        resultobj = wxPyMake_wxObject(result, 0); 
+        resultobj = wxPyMake_wxObject(result, (bool)0); 
     }
     return resultobj;
     fail:
@@ -26886,7 +27054,7 @@ static PyObject *_wrap_PyPrintPreview__setCallbackInfo(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_SetCurrentPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     int arg2 ;
@@ -26897,7 +27065,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *, PyObject *
         (char *) "self",(char *) "pageNum", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_SetCurrentPage",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_SetCurrentPage",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -26906,7 +27074,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *, PyObject *
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_SetCurrentPage(arg2);
+        result = (bool)(arg1)->SetCurrentPage(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -26920,7 +27088,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_PaintPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     wxPreviewCanvas *arg2 = (wxPreviewCanvas *) 0 ;
@@ -26933,7 +27101,7 @@ static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *, PyObject *args,
         (char *) "self",(char *) "canvas",(char *) "dc", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPrintPreview_base_PaintPage",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPrintPreview_PaintPage",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPreviewCanvas, SWIG_POINTER_EXCEPTION | 0);
@@ -26948,7 +27116,7 @@ static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *, PyObject *args,
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_PaintPage(arg2,*arg3);
+        result = (bool)(arg1)->PaintPage(arg2,*arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -26962,7 +27130,7 @@ static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_DrawBlankPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     wxPreviewCanvas *arg2 = (wxPreviewCanvas *) 0 ;
@@ -26975,7 +27143,7 @@ static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *, PyObject *a
         (char *) "self",(char *) "canvas",(char *) "dc", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPrintPreview_base_DrawBlankPage",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPrintPreview_DrawBlankPage",kwnames,&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPreviewCanvas, SWIG_POINTER_EXCEPTION | 0);
@@ -26990,7 +27158,7 @@ static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *, PyObject *a
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_DrawBlankPage(arg2,*arg3);
+        result = (bool)(arg1)->DrawBlankPage(arg2,*arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -27004,7 +27172,7 @@ static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_RenderPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     int arg2 ;
@@ -27015,7 +27183,7 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *, PyObject *args
         (char *) "self",(char *) "pageNum", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_RenderPage",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_RenderPage",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27024,7 +27192,7 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *, PyObject *args
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_RenderPage(arg2);
+        result = (bool)(arg1)->RenderPage(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -27038,7 +27206,7 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_SetZoom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     int arg2 ;
@@ -27048,7 +27216,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *, PyObject *args, P
         (char *) "self",(char *) "percent", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_SetZoom",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_SetZoom",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27057,7 +27225,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *, PyObject *args, P
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_SetZoom(arg2);
+        (arg1)->SetZoom(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -27069,7 +27237,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_Print(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     bool arg2 ;
@@ -27080,7 +27248,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *, PyObject *args, PyO
         (char *) "self",(char *) "interactive", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_Print",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_Print",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27089,7 +27257,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *, PyObject *args, PyO
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->base_Print(arg2);
+        result = (bool)(arg1)->Print(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -27103,7 +27271,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_DetermineScaling(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_DetermineScaling(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27111,12 +27279,12 @@ static PyObject *_wrap_PyPrintPreview_base_DetermineScaling(PyObject *, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPrintPreview_base_DetermineScaling",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPrintPreview_DetermineScaling",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_DetermineScaling();
+        (arg1)->DetermineScaling();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -27318,7 +27486,7 @@ static PyObject *_wrap_PyPreviewFrame_SetControlBar(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyPreviewFrame_base_Initialize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewFrame_Initialize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPreviewFrame *arg1 = (wxPyPreviewFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27326,12 +27494,12 @@ static PyObject *_wrap_PyPreviewFrame_base_Initialize(PyObject *, PyObject *args
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewFrame_base_Initialize",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewFrame_Initialize",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPreviewFrame, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_Initialize();
+        (arg1)->Initialize();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -27343,7 +27511,7 @@ static PyObject *_wrap_PyPreviewFrame_base_Initialize(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyPreviewFrame_base_CreateCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewFrame_CreateCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPreviewFrame *arg1 = (wxPyPreviewFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27351,12 +27519,12 @@ static PyObject *_wrap_PyPreviewFrame_base_CreateCanvas(PyObject *, PyObject *ar
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewFrame_base_CreateCanvas",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewFrame_CreateCanvas",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPreviewFrame, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_CreateCanvas();
+        (arg1)->CreateCanvas();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -27368,7 +27536,7 @@ static PyObject *_wrap_PyPreviewFrame_base_CreateCanvas(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyPreviewFrame_base_CreateControlBar(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewFrame_CreateControlBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPreviewFrame *arg1 = (wxPyPreviewFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27376,12 +27544,12 @@ static PyObject *_wrap_PyPreviewFrame_base_CreateControlBar(PyObject *, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewFrame_base_CreateControlBar",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewFrame_CreateControlBar",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPreviewFrame, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_CreateControlBar();
+        (arg1)->CreateControlBar();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -27544,7 +27712,7 @@ static PyObject *_wrap_PyPreviewControlBar_SetPrintPreview(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyPreviewControlBar_base_CreateButtons(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewControlBar_CreateButtons(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPreviewControlBar *arg1 = (wxPyPreviewControlBar *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27552,12 +27720,12 @@ static PyObject *_wrap_PyPreviewControlBar_base_CreateButtons(PyObject *, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewControlBar_base_CreateButtons",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewControlBar_CreateButtons",kwnames,&obj0)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPreviewControlBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_CreateButtons();
+        (arg1)->CreateButtons();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -27569,7 +27737,7 @@ static PyObject *_wrap_PyPreviewControlBar_base_CreateButtons(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyPreviewControlBar_base_SetZoomControl(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewControlBar_SetZoomControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxPyPreviewControlBar *arg1 = (wxPyPreviewControlBar *) 0 ;
     int arg2 ;
@@ -27579,7 +27747,7 @@ static PyObject *_wrap_PyPreviewControlBar_base_SetZoomControl(PyObject *, PyObj
         (char *) "self",(char *) "zoom", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPreviewControlBar_base_SetZoomControl",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPreviewControlBar_SetZoomControl",kwnames,&obj0,&obj1)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPreviewControlBar, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
@@ -27588,7 +27756,7 @@ static PyObject *_wrap_PyPreviewControlBar_base_SetZoomControl(PyObject *, PyObj
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_SetZoomControl(arg2);
+        (arg1)->SetZoomControl(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -27658,6 +27826,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"TopLevelWindow_IsActive", (PyCFunction) _wrap_TopLevelWindow_IsActive, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_MacSetMetalAppearance", (PyCFunction) _wrap_TopLevelWindow_MacSetMetalAppearance, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_MacGetMetalAppearance", (PyCFunction) _wrap_TopLevelWindow_MacGetMetalAppearance, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TopLevelWindow_CenterOnScreen", (PyCFunction) _wrap_TopLevelWindow_CenterOnScreen, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_swigregister", TopLevelWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"new_Frame", (PyCFunction) _wrap_new_Frame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreFrame", (PyCFunction) _wrap_new_PreFrame, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -27688,6 +27857,10 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Dialog_Create", (PyCFunction) _wrap_Dialog_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Dialog_SetReturnCode", (PyCFunction) _wrap_Dialog_SetReturnCode, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Dialog_GetReturnCode", (PyCFunction) _wrap_Dialog_GetReturnCode, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Dialog_SetAffirmativeId", (PyCFunction) _wrap_Dialog_SetAffirmativeId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Dialog_GetAffirmativeId", (PyCFunction) _wrap_Dialog_GetAffirmativeId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Dialog_SetEscapeId", (PyCFunction) _wrap_Dialog_SetEscapeId, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Dialog_GetEscapeId", (PyCFunction) _wrap_Dialog_GetEscapeId, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Dialog_CreateTextSizer", (PyCFunction) _wrap_Dialog_CreateTextSizer, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Dialog_CreateButtonSizer", (PyCFunction) _wrap_Dialog_CreateButtonSizer, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Dialog_CreateStdDialogButtonSizer", (PyCFunction) _wrap_Dialog_CreateStdDialogButtonSizer, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -27897,6 +28070,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlListBox_GetFileSystem", (PyCFunction) _wrap_HtmlListBox_GetFileSystem, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL},
         { (char *)"new_TaskBarIcon", (PyCFunction) _wrap_new_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_TaskBarIcon", (PyCFunction) _wrap_delete_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TaskBarIcon__setCallbackInfo", (PyCFunction) _wrap_TaskBarIcon__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TaskBarIcon_Destroy", (PyCFunction) _wrap_TaskBarIcon_Destroy, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TaskBarIcon_IsOk", (PyCFunction) _wrap_TaskBarIcon_IsOk, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -28041,81 +28215,81 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PyWindow__setCallbackInfo", (PyCFunction) _wrap_PyWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyWindow_SetBestSize", (PyCFunction) _wrap_PyWindow_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyWindow_DoEraseBackground", (PyCFunction) _wrap_PyWindow_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_DoMoveWindow", (PyCFunction) _wrap_PyWindow_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_DoSetSize", (PyCFunction) _wrap_PyWindow_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_DoSetClientSize", (PyCFunction) _wrap_PyWindow_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_DoSetVirtualSize", (PyCFunction) _wrap_PyWindow_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_DoGetSize", (PyCFunction) _wrap_PyWindow_base_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_DoGetClientSize", (PyCFunction) _wrap_PyWindow_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_DoGetPosition", (PyCFunction) _wrap_PyWindow_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_DoGetVirtualSize", (PyCFunction) _wrap_PyWindow_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_DoGetBestSize", (PyCFunction) _wrap_PyWindow_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_InitDialog", (PyCFunction) _wrap_PyWindow_base_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_TransferDataToWindow", (PyCFunction) _wrap_PyWindow_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_TransferDataFromWindow", (PyCFunction) _wrap_PyWindow_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_Validate", (PyCFunction) _wrap_PyWindow_base_Validate, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_AcceptsFocus", (PyCFunction) _wrap_PyWindow_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyWindow_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_GetMaxSize", (PyCFunction) _wrap_PyWindow_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_AddChild", (PyCFunction) _wrap_PyWindow_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_RemoveChild", (PyCFunction) _wrap_PyWindow_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_ShouldInheritColours", (PyCFunction) _wrap_PyWindow_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_GetDefaultAttributes", (PyCFunction) _wrap_PyWindow_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyWindow_base_OnInternalIdle", (PyCFunction) _wrap_PyWindow_base_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_DoMoveWindow", (PyCFunction) _wrap_PyWindow_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_DoSetSize", (PyCFunction) _wrap_PyWindow_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_DoSetClientSize", (PyCFunction) _wrap_PyWindow_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_DoSetVirtualSize", (PyCFunction) _wrap_PyWindow_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_DoGetSize", (PyCFunction) _wrap_PyWindow_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_DoGetClientSize", (PyCFunction) _wrap_PyWindow_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_DoGetPosition", (PyCFunction) _wrap_PyWindow_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_DoGetVirtualSize", (PyCFunction) _wrap_PyWindow_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_DoGetBestSize", (PyCFunction) _wrap_PyWindow_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_InitDialog", (PyCFunction) _wrap_PyWindow_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_TransferDataToWindow", (PyCFunction) _wrap_PyWindow_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_TransferDataFromWindow", (PyCFunction) _wrap_PyWindow_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_Validate", (PyCFunction) _wrap_PyWindow_Validate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_AcceptsFocus", (PyCFunction) _wrap_PyWindow_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyWindow_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_GetMaxSize", (PyCFunction) _wrap_PyWindow_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_AddChild", (PyCFunction) _wrap_PyWindow_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_RemoveChild", (PyCFunction) _wrap_PyWindow_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_ShouldInheritColours", (PyCFunction) _wrap_PyWindow_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_GetDefaultAttributes", (PyCFunction) _wrap_PyWindow_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyWindow_OnInternalIdle", (PyCFunction) _wrap_PyWindow_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyWindow_swigregister", PyWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"new_PyPanel", (PyCFunction) _wrap_new_PyPanel, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PrePyPanel", (PyCFunction) _wrap_new_PrePyPanel, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPanel__setCallbackInfo", (PyCFunction) _wrap_PyPanel__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPanel_SetBestSize", (PyCFunction) _wrap_PyPanel_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPanel_DoEraseBackground", (PyCFunction) _wrap_PyPanel_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_DoMoveWindow", (PyCFunction) _wrap_PyPanel_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_DoSetSize", (PyCFunction) _wrap_PyPanel_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_DoSetClientSize", (PyCFunction) _wrap_PyPanel_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_DoSetVirtualSize", (PyCFunction) _wrap_PyPanel_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_DoGetSize", (PyCFunction) _wrap_PyPanel_base_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_DoGetClientSize", (PyCFunction) _wrap_PyPanel_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_DoGetPosition", (PyCFunction) _wrap_PyPanel_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_DoGetVirtualSize", (PyCFunction) _wrap_PyPanel_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_DoGetBestSize", (PyCFunction) _wrap_PyPanel_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_InitDialog", (PyCFunction) _wrap_PyPanel_base_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_TransferDataToWindow", (PyCFunction) _wrap_PyPanel_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_TransferDataFromWindow", (PyCFunction) _wrap_PyPanel_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_Validate", (PyCFunction) _wrap_PyPanel_base_Validate, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_AcceptsFocus", (PyCFunction) _wrap_PyPanel_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyPanel_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_GetMaxSize", (PyCFunction) _wrap_PyPanel_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_AddChild", (PyCFunction) _wrap_PyPanel_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_RemoveChild", (PyCFunction) _wrap_PyPanel_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_ShouldInheritColours", (PyCFunction) _wrap_PyPanel_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_GetDefaultAttributes", (PyCFunction) _wrap_PyPanel_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPanel_base_OnInternalIdle", (PyCFunction) _wrap_PyPanel_base_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_DoMoveWindow", (PyCFunction) _wrap_PyPanel_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_DoSetSize", (PyCFunction) _wrap_PyPanel_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_DoSetClientSize", (PyCFunction) _wrap_PyPanel_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_DoSetVirtualSize", (PyCFunction) _wrap_PyPanel_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_DoGetSize", (PyCFunction) _wrap_PyPanel_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_DoGetClientSize", (PyCFunction) _wrap_PyPanel_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_DoGetPosition", (PyCFunction) _wrap_PyPanel_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_DoGetVirtualSize", (PyCFunction) _wrap_PyPanel_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_DoGetBestSize", (PyCFunction) _wrap_PyPanel_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_InitDialog", (PyCFunction) _wrap_PyPanel_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_TransferDataToWindow", (PyCFunction) _wrap_PyPanel_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_TransferDataFromWindow", (PyCFunction) _wrap_PyPanel_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_Validate", (PyCFunction) _wrap_PyPanel_Validate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_AcceptsFocus", (PyCFunction) _wrap_PyPanel_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyPanel_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_GetMaxSize", (PyCFunction) _wrap_PyPanel_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_AddChild", (PyCFunction) _wrap_PyPanel_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_RemoveChild", (PyCFunction) _wrap_PyPanel_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_ShouldInheritColours", (PyCFunction) _wrap_PyPanel_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_GetDefaultAttributes", (PyCFunction) _wrap_PyPanel_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPanel_OnInternalIdle", (PyCFunction) _wrap_PyPanel_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPanel_swigregister", PyPanel_swigregister, METH_VARARGS, NULL},
         { (char *)"new_PyScrolledWindow", (PyCFunction) _wrap_new_PyScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PrePyScrolledWindow", (PyCFunction) _wrap_new_PrePyScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyScrolledWindow__setCallbackInfo", (PyCFunction) _wrap_PyScrolledWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyScrolledWindow_SetBestSize", (PyCFunction) _wrap_PyScrolledWindow_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyScrolledWindow_DoEraseBackground", (PyCFunction) _wrap_PyScrolledWindow_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_DoMoveWindow", (PyCFunction) _wrap_PyScrolledWindow_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_DoSetSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_DoSetClientSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_DoSetVirtualSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_DoGetSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_DoGetClientSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_DoGetPosition", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_DoGetVirtualSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_DoGetBestSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_InitDialog", (PyCFunction) _wrap_PyScrolledWindow_base_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_TransferDataToWindow", (PyCFunction) _wrap_PyScrolledWindow_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_TransferDataFromWindow", (PyCFunction) _wrap_PyScrolledWindow_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_Validate", (PyCFunction) _wrap_PyScrolledWindow_base_Validate, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_AcceptsFocus", (PyCFunction) _wrap_PyScrolledWindow_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyScrolledWindow_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_GetMaxSize", (PyCFunction) _wrap_PyScrolledWindow_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_AddChild", (PyCFunction) _wrap_PyScrolledWindow_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_RemoveChild", (PyCFunction) _wrap_PyScrolledWindow_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_ShouldInheritColours", (PyCFunction) _wrap_PyScrolledWindow_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_GetDefaultAttributes", (PyCFunction) _wrap_PyScrolledWindow_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyScrolledWindow_base_OnInternalIdle", (PyCFunction) _wrap_PyScrolledWindow_base_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_DoMoveWindow", (PyCFunction) _wrap_PyScrolledWindow_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_DoSetSize", (PyCFunction) _wrap_PyScrolledWindow_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_DoSetClientSize", (PyCFunction) _wrap_PyScrolledWindow_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_DoSetVirtualSize", (PyCFunction) _wrap_PyScrolledWindow_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_DoGetSize", (PyCFunction) _wrap_PyScrolledWindow_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_DoGetClientSize", (PyCFunction) _wrap_PyScrolledWindow_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_DoGetPosition", (PyCFunction) _wrap_PyScrolledWindow_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_DoGetVirtualSize", (PyCFunction) _wrap_PyScrolledWindow_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_DoGetBestSize", (PyCFunction) _wrap_PyScrolledWindow_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_InitDialog", (PyCFunction) _wrap_PyScrolledWindow_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_TransferDataToWindow", (PyCFunction) _wrap_PyScrolledWindow_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_TransferDataFromWindow", (PyCFunction) _wrap_PyScrolledWindow_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_Validate", (PyCFunction) _wrap_PyScrolledWindow_Validate, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_AcceptsFocus", (PyCFunction) _wrap_PyScrolledWindow_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyScrolledWindow_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_GetMaxSize", (PyCFunction) _wrap_PyScrolledWindow_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_AddChild", (PyCFunction) _wrap_PyScrolledWindow_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_RemoveChild", (PyCFunction) _wrap_PyScrolledWindow_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_ShouldInheritColours", (PyCFunction) _wrap_PyScrolledWindow_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_GetDefaultAttributes", (PyCFunction) _wrap_PyScrolledWindow_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyScrolledWindow_OnInternalIdle", (PyCFunction) _wrap_PyScrolledWindow_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyScrolledWindow_swigregister", PyScrolledWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"new_PrintData", _wrap_new_PrintData, METH_VARARGS, NULL},
         { (char *)"delete_PrintData", (PyCFunction) _wrap_delete_PrintData, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -28250,13 +28424,13 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Printout_GetPPIPrinter", (PyCFunction) _wrap_Printout_GetPPIPrinter, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Printout_IsPreview", (PyCFunction) _wrap_Printout_IsPreview, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Printout_SetIsPreview", (PyCFunction) _wrap_Printout_SetIsPreview, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"Printout_base_OnBeginDocument", (PyCFunction) _wrap_Printout_base_OnBeginDocument, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"Printout_base_OnEndDocument", (PyCFunction) _wrap_Printout_base_OnEndDocument, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"Printout_base_OnBeginPrinting", (PyCFunction) _wrap_Printout_base_OnBeginPrinting, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"Printout_base_OnEndPrinting", (PyCFunction) _wrap_Printout_base_OnEndPrinting, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"Printout_base_OnPreparePrinting", (PyCFunction) _wrap_Printout_base_OnPreparePrinting, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"Printout_base_HasPage", (PyCFunction) _wrap_Printout_base_HasPage, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"Printout_base_GetPageInfo", (PyCFunction) _wrap_Printout_base_GetPageInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_OnBeginDocument", (PyCFunction) _wrap_Printout_OnBeginDocument, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_OnEndDocument", (PyCFunction) _wrap_Printout_OnEndDocument, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_OnBeginPrinting", (PyCFunction) _wrap_Printout_OnBeginPrinting, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_OnEndPrinting", (PyCFunction) _wrap_Printout_OnEndPrinting, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_OnPreparePrinting", (PyCFunction) _wrap_Printout_OnPreparePrinting, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_HasPage", (PyCFunction) _wrap_Printout_HasPage, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_GetPageInfo", (PyCFunction) _wrap_Printout_GetPageInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Printout_swigregister", Printout_swigregister, METH_VARARGS, NULL},
         { (char *)"new_PreviewCanvas", (PyCFunction) _wrap_new_PreviewCanvas, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PreviewCanvas_swigregister", PreviewCanvas_swigregister, METH_VARARGS, NULL},
@@ -28302,27 +28476,27 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PrintPreview_swigregister", PrintPreview_swigregister, METH_VARARGS, NULL},
         { (char *)"new_PyPrintPreview", _wrap_new_PyPrintPreview, METH_VARARGS, NULL},
         { (char *)"PyPrintPreview__setCallbackInfo", (PyCFunction) _wrap_PyPrintPreview__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPrintPreview_base_SetCurrentPage", (PyCFunction) _wrap_PyPrintPreview_base_SetCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPrintPreview_base_PaintPage", (PyCFunction) _wrap_PyPrintPreview_base_PaintPage, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPrintPreview_base_DrawBlankPage", (PyCFunction) _wrap_PyPrintPreview_base_DrawBlankPage, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPrintPreview_base_RenderPage", (PyCFunction) _wrap_PyPrintPreview_base_RenderPage, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPrintPreview_base_SetZoom", (PyCFunction) _wrap_PyPrintPreview_base_SetZoom, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPrintPreview_base_Print", (PyCFunction) _wrap_PyPrintPreview_base_Print, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPrintPreview_base_DetermineScaling", (PyCFunction) _wrap_PyPrintPreview_base_DetermineScaling, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPrintPreview_SetCurrentPage", (PyCFunction) _wrap_PyPrintPreview_SetCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPrintPreview_PaintPage", (PyCFunction) _wrap_PyPrintPreview_PaintPage, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPrintPreview_DrawBlankPage", (PyCFunction) _wrap_PyPrintPreview_DrawBlankPage, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPrintPreview_RenderPage", (PyCFunction) _wrap_PyPrintPreview_RenderPage, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPrintPreview_SetZoom", (PyCFunction) _wrap_PyPrintPreview_SetZoom, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPrintPreview_Print", (PyCFunction) _wrap_PyPrintPreview_Print, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPrintPreview_DetermineScaling", (PyCFunction) _wrap_PyPrintPreview_DetermineScaling, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPrintPreview_swigregister", PyPrintPreview_swigregister, METH_VARARGS, NULL},
         { (char *)"new_PyPreviewFrame", (PyCFunction) _wrap_new_PyPreviewFrame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPreviewFrame__setCallbackInfo", (PyCFunction) _wrap_PyPreviewFrame__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPreviewFrame_SetPreviewCanvas", (PyCFunction) _wrap_PyPreviewFrame_SetPreviewCanvas, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPreviewFrame_SetControlBar", (PyCFunction) _wrap_PyPreviewFrame_SetControlBar, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPreviewFrame_base_Initialize", (PyCFunction) _wrap_PyPreviewFrame_base_Initialize, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPreviewFrame_base_CreateCanvas", (PyCFunction) _wrap_PyPreviewFrame_base_CreateCanvas, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPreviewFrame_base_CreateControlBar", (PyCFunction) _wrap_PyPreviewFrame_base_CreateControlBar, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPreviewFrame_Initialize", (PyCFunction) _wrap_PyPreviewFrame_Initialize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPreviewFrame_CreateCanvas", (PyCFunction) _wrap_PyPreviewFrame_CreateCanvas, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPreviewFrame_CreateControlBar", (PyCFunction) _wrap_PyPreviewFrame_CreateControlBar, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPreviewFrame_swigregister", PyPreviewFrame_swigregister, METH_VARARGS, NULL},
         { (char *)"new_PyPreviewControlBar", (PyCFunction) _wrap_new_PyPreviewControlBar, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPreviewControlBar__setCallbackInfo", (PyCFunction) _wrap_PyPreviewControlBar__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPreviewControlBar_SetPrintPreview", (PyCFunction) _wrap_PyPreviewControlBar_SetPrintPreview, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPreviewControlBar_base_CreateButtons", (PyCFunction) _wrap_PyPreviewControlBar_base_CreateButtons, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"PyPreviewControlBar_base_SetZoomControl", (PyCFunction) _wrap_PyPreviewControlBar_base_SetZoomControl, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPreviewControlBar_CreateButtons", (PyCFunction) _wrap_PyPreviewControlBar_CreateButtons, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyPreviewControlBar_SetZoomControl", (PyCFunction) _wrap_PyPreviewControlBar_SetZoomControl, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPreviewControlBar_swigregister", PyPreviewControlBar_swigregister, METH_VARARGS, NULL},
         { NULL, NULL, 0, NULL }
 };