Moved wxPy_ConvertList function from oglhelpers to helpers

[wxWidgets.git] / utils / wxPython / src / msw / windows.cpp

diff --git a/utils/wxPython/src/msw/windows.cpp b/utils/wxPython/src/msw/windows.cpp
index 19c3b5d10410cb7aa1d0f9e7e6da25ccf026afab..42319e435413cab912c4b794d96c7e68dde35c05 100644 (file)
--- a/utils/wxPython/src/msw/windows.cpp
+++ b/utils/wxPython/src/msw/windows.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 5)
+ * Version 1.1 (Build 810)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)

-#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#      define SWIGEXPORT(a) __declspec(dllexport) a

 #   else
 #      if defined(__BORLANDC__)
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a,b) a _export b
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a,b) a b
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus


@@ -43,35 +43,28 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);

 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif

-

 #define SWIG_init    initwindowsc
 
 #define SWIG_name    "windowsc"
 
 #include "helpers.h"
 #define SWIG_init    initwindowsc
 
 #define SWIG_name    "windowsc"
 
 #include "helpers.h"

-
-#ifdef __WXMSW__
-    // wxGTK defines wxMenuItem inside menu.h

 #include <wx/menuitem.h>
 #include <wx/menuitem.h>

-#endif
-
-#ifdef __WXMSW__
-#include <wx/minifram.h>
-#endif

 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;

-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);


@@ -88,37 +81,37 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
     PyObject*   o2;
     PyObject*   o3;
 

-    if (!target) {
+    if (!target) {                   

         target = o;
         target = o;

-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  

         Py_DECREF(Py_None);
         target = o;
         Py_DECREF(Py_None);
         target = o;

-    } else {
+    } else {                         

         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }

-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

 
         o2 = target;
 
         o2 = target;

-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      

         Py_DECREF(o3);
     }
     return target;
 }
 
 
         Py_DECREF(o3);
     }
     return target;
 }
 
 

-extern byte* byte_LIST_helper(PyObject* source);
-extern int* int_LIST_helper(PyObject* source);
-extern long* long_LIST_helper(PyObject* source);
-extern char** string_LIST_helper(PyObject* source);
-extern wxPoint* wxPoint_LIST_helper(PyObject* source);
-extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
-extern wxString* wxString_LIST_helper(PyObject* source);
-extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
+HELPEREXPORT byte* byte_LIST_helper(PyObject* source);
+HELPEREXPORT int* int_LIST_helper(PyObject* source);
+HELPEREXPORT long* long_LIST_helper(PyObject* source);
+HELPEREXPORT char** string_LIST_helper(PyObject* source);
+HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source);
+HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source);
+HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source);
+HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);

 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";


@@ -126,17 +119,98 @@ static char* wxStringErrorMsg = "string type is required for parameter";
     wxWindow* wxWindow_FindFocus() {
         return wxWindow::FindFocus();
     }
     wxWindow* wxWindow_FindFocus() {
         return wxWindow::FindFocus();
     }

-static PyObject *_wrap_wxWindow_FindFocus(PyObject *self, PyObject *args) {
+
+wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
+    wxWindow* win = new wxWindow;
+    win->SetHWND(hWnd);
+    win->SubclassWin(hWnd);
+    return win;
+}
+#ifdef __cplusplus
+extern "C" {
+#endif
+static PyObject *_wrap_wxWindow_FindFocus(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _result;
     PyObject * _resultobj;
     wxWindow * _result;

+    char *_kwnames[] = {  NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,":wxWindow_FindFocus")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxWindow_FindFocus",_kwnames)) 

         return NULL;
         return NULL;

-    _result = (wxWindow *)wxWindow_FindFocus();
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxWindow *)wxWindow_FindFocus();
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
+static PyObject *_wrap_wxWindow_FromHWND(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _result;
+    unsigned long  _arg0;
+    char *_kwnames[] = { "hWnd", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"l:wxWindow_FromHWND",_kwnames,&_arg0)) 
+        return NULL;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxWindow *)wxWindow_FromHWND(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
+#define wxEvtHandler_ProcessEvent(_swigobj,_swigarg0)  (_swigobj->ProcessEvent(_swigarg0))
+static PyObject *_wrap_wxEvtHandler_ProcessEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxEvtHandler * _arg0;
+    wxEvent * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","event", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxEvtHandler_ProcessEvent",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvtHandler_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_ProcessEvent. Expected _wxEvtHandler_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxEvtHandler_ProcessEvent. Expected _wxEvent_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxEvtHandler_ProcessEvent(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -147,21 +221,23 @@ static void  wxEvtHandler_Connect(wxEvtHandler *self,int  id,int  lastId,int  ev
                           new wxPyCallback(func));
             }
         }
                           new wxPyCallback(func));
             }
         }

-static PyObject *_wrap_wxEvtHandler_Connect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEvtHandler_Connect(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxEvtHandler * _arg0;
     int  _arg1;
     int  _arg2;
     int  _arg3;
     PyObject * _arg4;
     PyObject * _resultobj;
     wxEvtHandler * _arg0;
     int  _arg1;
     int  _arg2;
     int  _arg3;
     PyObject * _arg4;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj4 = 0;
     PyObject * _obj4 = 0;

+    char *_kwnames[] = { "self","id","lastId","eventType","func", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siiiO:wxEvtHandler_Connect",&_argc0,&_arg1,&_arg2,&_arg3,&_obj4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiiO:wxEvtHandler_Connect",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_obj4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxEvtHandler_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvtHandler_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_Connect. Expected _wxEvtHandler_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_Connect. Expected _wxEvtHandler_p.");
         return NULL;
         }


@@ -169,8 +245,12 @@ static PyObject *_wrap_wxEvtHandler_Connect(PyObject *self, PyObject *args) {
 {
   _arg4 = _obj4;
 }
 {
   _arg4 = _obj4;
 }

-    wxEvtHandler_Connect(_arg0,_arg1,_arg2,_arg3,_arg4);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxEvtHandler_Connect(_arg0,_arg1,_arg2,_arg3,_arg4);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
     _resultobj = Py_None;
     return _resultobj;
 }


@@ -184,130 +264,219 @@ static void *SwigwxWindowTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
 }
 
 #define new_wxWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))

-static PyObject *_wrap_new_wxWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxWindow(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = 0;
-    char * _arg5 = "panel";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) 0;
+    char * _arg5 = (char *) "panel";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxWindow",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxWindow. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxWindow. Expected _wxSize_p.");
         return NULL;
         }
     }

-    _result = (wxWindow *)new_wxWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxWindow *)new_wxWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 #define wxWindow_CaptureMouse(_swigobj)  (_swigobj->CaptureMouse())
     return _resultobj;
 }
 
 #define wxWindow_CaptureMouse(_swigobj)  (_swigobj->CaptureMouse())

-static PyObject *_wrap_wxWindow_CaptureMouse(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_CaptureMouse(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_CaptureMouse",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_CaptureMouse",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_CaptureMouse. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_CaptureMouse. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_CaptureMouse(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_CaptureMouse(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_Center(_swigobj,_swigarg0)  (_swigobj->Center(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_Center(_swigobj,_swigarg0)  (_swigobj->Center(_swigarg0))

-static PyObject *_wrap_wxWindow_Center(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Center(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _arg0;

-    int  _arg1 = (wxHORIZONTAL);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxBOTH;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","direction", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxWindow_Center",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxWindow_Center",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Center. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Center. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_Center(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_Center(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_Centre(_swigobj,_swigarg0)  (_swigobj->Centre(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_Centre(_swigobj,_swigarg0)  (_swigobj->Centre(_swigarg0))

-static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _arg0;

-    int  _arg1 = (wxHORIZONTAL);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxBOTH;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","direction", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxWindow_Centre",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxWindow_Centre",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Centre. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Centre. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_Centre(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_Centre(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxWindow_CentreOnParent(_swigobj,_swigarg0)  (_swigobj->CentreOnParent(_swigarg0))
+static PyObject *_wrap_wxWindow_CentreOnParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    int  _arg1 = (int ) wxBOTH;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","direction", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxWindow_CentreOnParent",_kwnames,&_argo0,&_arg1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_CentreOnParent. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_CentreOnParent(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxWindow_CenterOnParent(_swigobj,_swigarg0)  (_swigobj->CenterOnParent(_swigarg0))
+static PyObject *_wrap_wxWindow_CenterOnParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    int  _arg1 = (int ) wxBOTH;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","direction", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxWindow_CenterOnParent",_kwnames,&_argo0,&_arg1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_CenterOnParent. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_CenterOnParent(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
     _resultobj = Py_None;
     return _resultobj;
 }
 

-#define wxWindow_ClientToScreen(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ClientToScreen(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) {
+#define wxWindow_ClientToScreenXY(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ClientToScreen(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_ClientToScreenXY(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
     int * _arg2;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
     int * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int  temp;
     PyObject * _obj1 = 0;
     int  temp0;
     PyObject * _obj2 = 0;
     int  temp;
     PyObject * _obj1 = 0;
     int  temp0;
     PyObject * _obj2 = 0;

+    char *_kwnames[] = { "self","x","y", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOO:wxWindow_ClientToScreen",&_argc0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxWindow_ClientToScreenXY",_kwnames,&_argo0,&_obj1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ClientToScreen. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ClientToScreenXY. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -319,8 +488,12 @@ static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) {
   temp0 = (int) PyInt_AsLong(_obj2);
   _arg2 = &temp0;
 }
   temp0 = (int) PyInt_AsLong(_obj2);
   _arg2 = &temp0;
 }

-    wxWindow_ClientToScreen(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_ClientToScreenXY(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     PyObject *o;
     _resultobj = Py_None;
 {
     PyObject *o;


@@ -335,157 +508,238 @@ static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxWindow_ClientToScreen(_swigobj,_swigarg0)  (_swigobj->ClientToScreen(_swigarg0))
+static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxPoint * _result;
+    wxWindow * _arg0;
+    wxPoint * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ClientToScreen",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ClientToScreen. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ClientToScreen. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxPoint (wxWindow_ClientToScreen(_arg0,*_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 #define wxWindow_Close(_swigobj,_swigarg0)  (_swigobj->Close(_swigarg0))
 #define wxWindow_Close(_swigobj,_swigarg0)  (_swigobj->Close(_swigarg0))

-static PyObject *_wrap_wxWindow_Close(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Close(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    int  _arg1 = (0);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) FALSE;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","force", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxWindow_Close",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxWindow_Close",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Close. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Close. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (bool )wxWindow_Close(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_Close(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxWindow_Destroy(_swigobj)  (_swigobj->Destroy())
     return _resultobj;
 }
 
 #define wxWindow_Destroy(_swigobj)  (_swigobj->Destroy())

-static PyObject *_wrap_wxWindow_Destroy(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_Destroy",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Destroy",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Destroy. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Destroy. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (bool )wxWindow_Destroy(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_Destroy(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxWindow_DestroyChildren(_swigobj)  (_swigobj->DestroyChildren())
     return _resultobj;
 }
 
 #define wxWindow_DestroyChildren(_swigobj)  (_swigobj->DestroyChildren())

-static PyObject *_wrap_wxWindow_DestroyChildren(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_DestroyChildren(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_DestroyChildren",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_DestroyChildren",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_DestroyChildren. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_DestroyChildren. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_DestroyChildren(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_DestroyChildren(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_DragAcceptFiles(_swigobj,_swigarg0)  (_swigobj->DragAcceptFiles(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_DragAcceptFiles(_swigobj,_swigarg0)  (_swigobj->DragAcceptFiles(_swigarg0))

-static PyObject *_wrap_wxWindow_DragAcceptFiles(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_DragAcceptFiles(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
     int tempbool1;

+    char *_kwnames[] = { "self","accept", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_DragAcceptFiles",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_DragAcceptFiles",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_DragAcceptFiles. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_DragAcceptFiles. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;

-    wxWindow_DragAcceptFiles(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_DragAcceptFiles(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_Enable(_swigobj,_swigarg0)  (_swigobj->Enable(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_Enable(_swigobj,_swigarg0)  (_swigobj->Enable(_swigarg0))

-static PyObject *_wrap_wxWindow_Enable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
     int tempbool1;

+    char *_kwnames[] = { "self","enable", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_Enable",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_Enable",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Enable. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Enable. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;

-    wxWindow_Enable(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_Enable(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
     _resultobj = Py_None;
     return _resultobj;
 }
 

-#define wxWindow_FindWindowByID(_swigobj,_swigarg0)  (_swigobj->FindWindow(_swigarg0))
-static PyObject *_wrap_wxWindow_FindWindowByID(PyObject *self, PyObject *args) {
+#define wxWindow_FindWindowById(_swigobj,_swigarg0)  (_swigobj->FindWindow(_swigarg0))
+static PyObject *_wrap_wxWindow_FindWindowById(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     long  _arg1;
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     long  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxWindow_FindWindowByID",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxWindow_FindWindowById",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_FindWindowByID. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_FindWindowById. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxWindow *)wxWindow_FindWindowByID(_arg0,_arg1);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxWindow *)wxWindow_FindWindowById(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 #define wxWindow_FindWindowByName(_swigobj,_swigarg0)  (_swigobj->FindWindow(_swigarg0))
     return _resultobj;
 }
 
 #define wxWindow_FindWindowByName(_swigobj,_swigarg0)  (_swigobj->FindWindow(_swigarg0))

-static PyObject *_wrap_wxWindow_FindWindowByName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_FindWindowByName(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

+    char *_kwnames[] = { "self","name", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxWindow_FindWindowByName",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_FindWindowByName",_kwnames,&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_FindWindowByName. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_FindWindowByName. Expected _wxWindow_p.");
         return NULL;
         }


@@ -495,11 +749,20 @@ static PyObject *_wrap_wxWindow_FindWindowByName(PyObject *self, PyObject *args)
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));

 }
 }

-    _result = (wxWindow *)wxWindow_FindWindowByName(_arg0,*_arg1);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxWindow *)wxWindow_FindWindowByName(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj1)
         delete _arg1;
 {
     if (_obj1)
         delete _arg1;


@@ -508,100 +771,125 @@ static PyObject *_wrap_wxWindow_FindWindowByName(PyObject *self, PyObject *args)
 }
 
 #define wxWindow_Fit(_swigobj)  (_swigobj->Fit())
 }
 
 #define wxWindow_Fit(_swigobj)  (_swigobj->Fit())

-static PyObject *_wrap_wxWindow_Fit(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Fit(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_Fit",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Fit",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Fit. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Fit. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_Fit(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_Fit(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_GetBackgroundColour(_swigobj)  (_swigobj->GetBackgroundColour())
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_GetBackgroundColour(_swigobj)  (_swigobj->GetBackgroundColour())

-static PyObject *_wrap_wxWindow_GetBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxColour * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetBackgroundColour",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetBackgroundColour",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetBackgroundColour. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetBackgroundColour. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = new wxColour (wxWindow_GetBackgroundColour(_arg0));
-    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxColour (wxWindow_GetBackgroundColour(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");

     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 
 #define wxWindow_GetCharHeight(_swigobj)  (_swigobj->GetCharHeight())
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 
 #define wxWindow_GetCharHeight(_swigobj)  (_swigobj->GetCharHeight())

-static PyObject *_wrap_wxWindow_GetCharHeight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetCharHeight(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetCharHeight",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetCharHeight",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetCharHeight. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetCharHeight. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (int )wxWindow_GetCharHeight(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxWindow_GetCharHeight(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxWindow_GetCharWidth(_swigobj)  (_swigobj->GetCharWidth())
     return _resultobj;
 }
 
 #define wxWindow_GetCharWidth(_swigobj)  (_swigobj->GetCharWidth())

-static PyObject *_wrap_wxWindow_GetCharWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetCharWidth(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetCharWidth",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetCharWidth",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetCharWidth. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetCharWidth. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (int )wxWindow_GetCharWidth(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxWindow_GetCharWidth(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_GetClientSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetClientSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
+#define wxWindow_GetClientSizeTuple(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetClientSize(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
     int  temp;
     int * _arg2;
     int  temp0;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 {
 
     self = self;
 {


@@ -610,16 +898,21 @@ static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetClientSize",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetClientSizeTuple",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetClientSize. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetClientSizeTuple. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxWindow_GetClientSize(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_GetClientSizeTuple(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     PyObject *o;
     _resultobj = Py_None;
 {
     PyObject *o;


@@ -634,227 +927,324 @@ static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxWindow_GetClientSize(_swigobj)  (_swigobj->GetClientSize())
+static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxSize * _result;
+    wxWindow * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetClientSize",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetClientSize. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxSize (wxWindow_GetClientSize(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 #define wxWindow_GetConstraints(_swigobj)  (_swigobj->GetConstraints())
 #define wxWindow_GetConstraints(_swigobj)  (_swigobj->GetConstraints())

-static PyObject *_wrap_wxWindow_GetConstraints(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetConstraints(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxLayoutConstraints * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxLayoutConstraints * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetConstraints",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetConstraints",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetConstraints. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetConstraints. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (wxLayoutConstraints *)wxWindow_GetConstraints(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutConstraints_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxLayoutConstraints *)wxWindow_GetConstraints(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutConstraints_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_GetDefaultItem(_swigobj)  (_swigobj->GetDefaultItem())
-static PyObject *_wrap_wxWindow_GetDefaultItem(PyObject *self, PyObject *args) {
+#define wxWindow_GetEventHandler(_swigobj)  (_swigobj->GetEventHandler())
+static PyObject *_wrap_wxWindow_GetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxButton * _result;
+    wxEvtHandler * _result;

     wxWindow * _arg0;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetDefaultItem",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetEventHandler",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetDefaultItem. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetEventHandler. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxButton *)wxWindow_GetDefaultItem(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxButton_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxEvtHandler *)wxWindow_GetEventHandler(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxEvtHandler_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 #define wxWindow_GetFont(_swigobj)  (_swigobj->GetFont())
     return _resultobj;
 }
 
 #define wxWindow_GetFont(_swigobj)  (_swigobj->GetFont())

-static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxFont * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxFont * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetFont",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetFont",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetFont. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetFont. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (wxFont *)wxWindow_GetFont(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxFont & _result_ref = wxWindow_GetFont(_arg0);
+    _result = (wxFont *) &_result_ref;
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 #define wxWindow_GetForegroundColour(_swigobj)  (_swigobj->GetForegroundColour())
     return _resultobj;
 }
 
 #define wxWindow_GetForegroundColour(_swigobj)  (_swigobj->GetForegroundColour())

-static PyObject *_wrap_wxWindow_GetForegroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxColour * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxColour * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetForegroundColour",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetForegroundColour",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetForegroundColour. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetForegroundColour. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = new wxColour (wxWindow_GetForegroundColour(_arg0));
-    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxColour (wxWindow_GetForegroundColour(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");

     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 
 #define wxWindow_GetGrandParent(_swigobj)  (_swigobj->GetGrandParent())
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 
 #define wxWindow_GetGrandParent(_swigobj)  (_swigobj->GetGrandParent())

-static PyObject *_wrap_wxWindow_GetGrandParent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetGrandParent(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetGrandParent",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetGrandParent",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetGrandParent. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetGrandParent. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (wxWindow *)wxWindow_GetGrandParent(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxWindow *)wxWindow_GetGrandParent(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 #define wxWindow_GetId(_swigobj)  (_swigobj->GetId())
     return _resultobj;
 }
 
 #define wxWindow_GetId(_swigobj)  (_swigobj->GetId())

-static PyObject *_wrap_wxWindow_GetId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetId",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetId",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetId. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetId. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (int )wxWindow_GetId(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxWindow_GetId(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_GetPosition(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetPosition(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_GetPosition(PyObject *self, PyObject *args) {
+#define wxWindow_GetLabel(_swigobj)  (_swigobj->GetLabel())
+static PyObject *_wrap_wxWindow_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

+    wxString * _result;

     wxWindow * _arg0;
     wxWindow * _arg0;

-    int * _arg1;
-    int  temp;
-    int * _arg2;
-    int  temp0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-{
-  _arg1 = &temp;
-}
-{
-  _arg2 = &temp0;
-}
-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetPosition",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetLabel",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetPosition. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetLabel. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxWindow_GetPosition(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;

 {
 {

-    PyObject *o;
-    o = PyInt_FromLong((long) (*_arg1));
-    _resultobj = t_output_helper(_resultobj, o);
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxWindow_GetLabel(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{
+    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));

 }
 {
 }
 {

-    PyObject *o;
-    o = PyInt_FromLong((long) (*_arg2));
-    _resultobj = t_output_helper(_resultobj, o);
+    delete _result;

 }
     return _resultobj;
 }
 
 }
     return _resultobj;
 }
 

-#define wxWindow_GetLabel(_swigobj)  (_swigobj->GetLabel())
-static PyObject *_wrap_wxWindow_GetLabel(PyObject *self, PyObject *args) {
+#define wxWindow_SetLabel(_swigobj,_swigarg0)  (_swigobj->SetLabel(_swigarg0))
+static PyObject *_wrap_wxWindow_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxString * _result;

     wxWindow * _arg0;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    wxString * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","label", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetLabel",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetLabel",_kwnames,&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetLabel. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetLabel. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = new wxString (wxWindow_GetLabel(_arg0));

 {
 {

-    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));

 }
 {
 }
 {

-    delete _result;
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetLabel(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    if (_obj1)
+        delete _arg1;

 }
     return _resultobj;
 }
 
 #define wxWindow_GetName(_swigobj)  (_swigobj->GetName())
 }
     return _resultobj;
 }
 
 #define wxWindow_GetName(_swigobj)  (_swigobj->GetName())

-static PyObject *_wrap_wxWindow_GetName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetName",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetName",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetName. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetName. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = new wxString (wxWindow_GetName(_arg0));

 {
 {

+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxWindow_GetName(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{

     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {


@@ -864,124 +1254,238 @@ static PyObject *_wrap_wxWindow_GetName(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetParent(_swigobj)  (_swigobj->GetParent())
 }
 
 #define wxWindow_GetParent(_swigobj)  (_swigobj->GetParent())

-static PyObject *_wrap_wxWindow_GetParent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetParent",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetParent",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetParent. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetParent. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (wxWindow *)wxWindow_GetParent(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxWindow *)wxWindow_GetParent(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_GetReturnCode(_swigobj)  (_swigobj->GetReturnCode())
-static PyObject *_wrap_wxWindow_GetReturnCode(PyObject *self, PyObject *args) {
+#define wxWindow_GetPositionTuple(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetPosition(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    int  _result;

     wxWindow * _arg0;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    int * _arg1;
+    int  temp;
+    int * _arg2;
+    int  temp0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetReturnCode",&_argc0)) 
+{
+  _arg1 = &temp;
+}
+{
+  _arg2 = &temp0;
+}
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetPositionTuple",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetReturnCode. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetPositionTuple. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (int )wxWindow_GetReturnCode(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_GetPositionTuple(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg1));
+    _resultobj = t_output_helper(_resultobj, o);
+}
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg2));
+    _resultobj = t_output_helper(_resultobj, o);
+}

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_GetScrollThumb(_swigobj,_swigarg0)  (_swigobj->GetScrollThumb(_swigarg0))
-static PyObject *_wrap_wxWindow_GetScrollThumb(PyObject *self, PyObject *args) {
+#define wxWindow_GetPosition(_swigobj)  (_swigobj->GetPosition())
+static PyObject *_wrap_wxWindow_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    int  _result;
+    wxPoint * _result;

     wxWindow * _arg0;
     wxWindow * _arg0;

-    int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetPosition",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetPosition. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxPoint (wxWindow_GetPosition(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxWindow_GetRect(_swigobj)  (_swigobj->GetRect())
+static PyObject *_wrap_wxWindow_GetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxRect * _result;
+    wxWindow * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetRect",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetRect. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxRect (wxWindow_GetRect(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxWindow_GetScrollThumb(_swigobj,_swigarg0)  (_swigobj->GetScrollThumb(_swigarg0))
+static PyObject *_wrap_wxWindow_GetScrollThumb(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    int  _result;
+    wxWindow * _arg0;
+    int  _arg1;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orientation", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_GetScrollThumb",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_GetScrollThumb",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetScrollThumb. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetScrollThumb. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (int )wxWindow_GetScrollThumb(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxWindow_GetScrollThumb(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxWindow_GetScrollPos(_swigobj,_swigarg0)  (_swigobj->GetScrollPos(_swigarg0))
     return _resultobj;
 }
 
 #define wxWindow_GetScrollPos(_swigobj,_swigarg0)  (_swigobj->GetScrollPos(_swigarg0))

-static PyObject *_wrap_wxWindow_GetScrollPos(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetScrollPos(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orientation", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_GetScrollPos",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_GetScrollPos",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetScrollPos. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetScrollPos. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (int )wxWindow_GetScrollPos(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxWindow_GetScrollPos(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxWindow_GetScrollRange(_swigobj,_swigarg0)  (_swigobj->GetScrollRange(_swigarg0))
     return _resultobj;
 }
 
 #define wxWindow_GetScrollRange(_swigobj,_swigarg0)  (_swigobj->GetScrollRange(_swigarg0))

-static PyObject *_wrap_wxWindow_GetScrollRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetScrollRange(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orientation", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_GetScrollRange",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_GetScrollRange",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetScrollRange. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetScrollRange. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (int )wxWindow_GetScrollRange(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxWindow_GetScrollRange(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_GetSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) {
+#define wxWindow_GetSizeTuple(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetSize(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
     int  temp;
     int * _arg2;
     int  temp0;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 {
 
     self = self;
 {


@@ -990,16 +1494,21 @@ static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetSize",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetSizeTuple",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetSize. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetSizeTuple. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxWindow_GetSize(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_GetSizeTuple(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     PyObject *o;
     _resultobj = Py_None;
 {
     PyObject *o;


@@ -1014,8 +1523,37 @@ static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxWindow_GetSize(_swigobj)  (_swigobj->GetSize())
+static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxSize * _result;
+    wxWindow * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetSize",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetSize. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxSize (wxWindow_GetSize(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 #define wxWindow_GetTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2))
 #define wxWindow_GetTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2))

-static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;


@@ -1023,8 +1561,9 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
     int  temp;
     int * _arg3;
     int  temp0;
     int  temp;
     int * _arg3;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

+    char *_kwnames[] = { "self","string", NULL };

 
     self = self;
 {
 
     self = self;
 {


@@ -1033,10 +1572,11 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
 {
   _arg3 = &temp0;
 }
 {
   _arg3 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"sO:wxWindow_GetTextExtent",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_GetTextExtent",_kwnames,&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetTextExtent. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetTextExtent. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1046,10 +1586,93 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_GetTextExtent(_arg0,*_arg1,_arg2,_arg3);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg2));
+    _resultobj = t_output_helper(_resultobj, o);
+}
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg3));
+    _resultobj = t_output_helper(_resultobj, o);
+}
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxWindow_GetFullTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)  (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
+static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxString * _arg1;
+    int * _arg2;
+    int  temp;
+    int * _arg3;
+    int  temp0;
+    int * _arg4;
+    int  temp1;
+    int * _arg5;
+    int  temp2;
+    wxFont * _arg6 = (wxFont *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _obj1 = 0;
+    PyObject * _argo6 = 0;
+    char *_kwnames[] = { "self","string","font", NULL };
+
+    self = self;
+{
+  _arg2 = &temp;
+}
+{
+  _arg3 = &temp0;
+}
+{
+  _arg4 = &temp1;
+}
+{
+  _arg5 = &temp2;
+}
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxWindow_GetFullTextExtent",_kwnames,&_argo0,&_obj1,&_argo6)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetFullTextExtent. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));

 }
 }

-    wxWindow_GetTextExtent(_arg0,*_arg1,_arg2,_arg3);
-    Py_INCREF(Py_None);
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxFont_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxWindow_GetFullTextExtent. Expected _wxFont_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_GetFullTextExtent(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     PyObject *o;
     _resultobj = Py_None;
 {
     PyObject *o;


@@ -1061,6 +1684,16 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
     o = PyInt_FromLong((long) (*_arg3));
     _resultobj = t_output_helper(_resultobj, o);
 }
     o = PyInt_FromLong((long) (*_arg3));
     _resultobj = t_output_helper(_resultobj, o);
 }

+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg4));
+    _resultobj = t_output_helper(_resultobj, o);
+}
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg5));
+    _resultobj = t_output_helper(_resultobj, o);
+}

 {
     if (_obj1)
         delete _arg1;
 {
     if (_obj1)
         delete _arg1;


@@ -1069,23 +1702,29 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetTitle(_swigobj)  (_swigobj->GetTitle())
 }
 
 #define wxWindow_GetTitle(_swigobj)  (_swigobj->GetTitle())

-static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetTitle",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetTitle",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetTitle. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetTitle. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = new wxString (wxWindow_GetTitle(_arg0));

 {
 {

+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxWindow_GetTitle(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{

     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {


@@ -1094,156 +1733,278 @@ static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxWindow_GetUpdateRegion(_swigobj)  (_swigobj->GetUpdateRegion())
+static PyObject *_wrap_wxWindow_GetUpdateRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxRegion * _result;
+    wxWindow * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetUpdateRegion",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetUpdateRegion. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxRegion (wxWindow_GetUpdateRegion(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRegion_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 #define wxWindow_GetWindowStyleFlag(_swigobj)  (_swigobj->GetWindowStyleFlag())
 #define wxWindow_GetWindowStyleFlag(_swigobj)  (_swigobj->GetWindowStyleFlag())

-static PyObject *_wrap_wxWindow_GetWindowStyleFlag(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetWindowStyleFlag(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     long  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetWindowStyleFlag",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetWindowStyleFlag",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetWindowStyleFlag. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetWindowStyleFlag. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (long )wxWindow_GetWindowStyleFlag(_arg0);
-    _resultobj = Py_BuildValue("l",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (long )wxWindow_GetWindowStyleFlag(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+
+#define wxWindow_Hide(_swigobj)  (_swigobj->Hide())
+static PyObject *_wrap_wxWindow_Hide(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxWindow * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Hide",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Hide. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_Hide(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxWindow_InitDialog(_swigobj)  (_swigobj->InitDialog())
     return _resultobj;
 }
 
 #define wxWindow_InitDialog(_swigobj)  (_swigobj->InitDialog())

-static PyObject *_wrap_wxWindow_InitDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_InitDialog(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_InitDialog",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_InitDialog",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_InitDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_InitDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_InitDialog(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_InitDialog(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_IsEnabled(_swigobj)  (_swigobj->IsEnabled())
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_IsEnabled(_swigobj)  (_swigobj->IsEnabled())

-static PyObject *_wrap_wxWindow_IsEnabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_IsEnabled",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_IsEnabled",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsEnabled. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsEnabled. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (bool )wxWindow_IsEnabled(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_IsEnabled(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxWindow_IsRetained(_swigobj)  (_swigobj->IsRetained())
     return _resultobj;
 }
 
 #define wxWindow_IsRetained(_swigobj)  (_swigobj->IsRetained())

-static PyObject *_wrap_wxWindow_IsRetained(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_IsRetained(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_IsRetained",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_IsRetained",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsRetained. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsRetained. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (bool )wxWindow_IsRetained(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_IsRetained(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxWindow_IsShown(_swigobj)  (_swigobj->IsShown())
     return _resultobj;
 }
 
 #define wxWindow_IsShown(_swigobj)  (_swigobj->IsShown())

-static PyObject *_wrap_wxWindow_IsShown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_IsShown(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_IsShown",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_IsShown",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsShown. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsShown. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (bool )wxWindow_IsShown(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_IsShown(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxWindow_IsTopLevel(_swigobj)  (_swigobj->IsTopLevel())
+static PyObject *_wrap_wxWindow_IsTopLevel(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxWindow * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_IsTopLevel",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_IsTopLevel. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_IsTopLevel(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxWindow_Layout(_swigobj)  (_swigobj->Layout())
     return _resultobj;
 }
 
 #define wxWindow_Layout(_swigobj)  (_swigobj->Layout())

-static PyObject *_wrap_wxWindow_Layout(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Layout(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_Layout",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Layout",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Layout. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Layout. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_Layout(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_Layout(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_LoadFromResource(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->LoadFromResource(_swigarg0,_swigarg1,_swigarg2))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_LoadFromResource(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->LoadFromResource(_swigarg0,_swigarg1,_swigarg2))

-static PyObject *_wrap_wxWindow_LoadFromResource(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_LoadFromResource(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     wxWindow * _arg1;
     wxString * _arg2;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     wxWindow * _arg1;
     wxString * _arg2;

-    wxResourceTable * _arg3 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxResourceTable * _arg3 = (wxResourceTable *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;
+    char *_kwnames[] = { "self","parent","resourceName","resourceTable", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssO|s:wxWindow_LoadFromResource",&_argc0,&_argc1,&_obj2,&_argc3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|O:wxWindow_LoadFromResource",_kwnames,&_argo0,&_argo1,&_obj2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_LoadFromResource. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_LoadFromResource. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_LoadFromResource. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_LoadFromResource. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1253,16 +2014,21 @@ static PyObject *_wrap_wxWindow_LoadFromResource(PyObject *self, PyObject *args)
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));

 }
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxResourceTable_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxResourceTable_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxWindow_LoadFromResource. Expected _wxResourceTable_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxWindow_LoadFromResource. Expected _wxResourceTable_p.");
         return NULL;
         }
     }

-    _result = (bool )wxWindow_LoadFromResource(_arg0,_arg1,*_arg2,_arg3);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_LoadFromResource(_arg0,_arg1,*_arg2,_arg3);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -1271,214 +2037,454 @@ static PyObject *_wrap_wxWindow_LoadFromResource(PyObject *self, PyObject *args)
 }
 
 #define wxWindow_Lower(_swigobj)  (_swigobj->Lower())
 }
 
 #define wxWindow_Lower(_swigobj)  (_swigobj->Lower())

-static PyObject *_wrap_wxWindow_Lower(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Lower(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_Lower",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Lower",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Lower. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Lower. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_Lower(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_Lower(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_MakeModal(_swigobj,_swigarg0)  (_swigobj->MakeModal(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_MakeModal(_swigobj,_swigarg0)  (_swigobj->MakeModal(_swigarg0))

-static PyObject *_wrap_wxWindow_MakeModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_MakeModal(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
     int tempbool1;

+    char *_kwnames[] = { "self","flag", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_MakeModal",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_MakeModal",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_MakeModal. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_MakeModal. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;

-    wxWindow_MakeModal(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_MakeModal(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
     _resultobj = Py_None;
     return _resultobj;
 }
 

-#define wxWindow_Move(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Move(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args) {
+#define wxWindow_MoveXY(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Move(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_MoveXY(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxWindow_Move",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxWindow_MoveXY",_kwnames,&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Move. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_MoveXY. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxWindow_Move(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_MoveXY(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
     _resultobj = Py_None;
     return _resultobj;
 }
 

-#define wxWindow_PopupMenu(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->PopupMenu(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
+#define wxWindow_Move(_swigobj,_swigarg0)  (_swigobj->Move(_swigarg0))
+static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    bool  _result;

     wxWindow * _arg0;
     wxWindow * _arg0;

-    wxMenu * _arg1;
-    int  _arg2;
-    int  _arg3;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxPoint * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","point", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssii:wxWindow_PopupMenu",&_argc0,&_argc1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_Move",_kwnames,&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_PopupMenu. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Move. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenu_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_PopupMenu. Expected _wxMenu_p.");
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_Move. Expected _wxPoint_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (bool )wxWindow_PopupMenu(_arg0,_arg1,_arg2,_arg3);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_Move(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_Raise(_swigobj)  (_swigobj->Raise())
-static PyObject *_wrap_wxWindow_Raise(PyObject *self, PyObject *args) {
+#define wxWindow_PopEventHandler(_swigobj,_swigarg0)  (_swigobj->PopEventHandler(_swigarg0))
+static PyObject *_wrap_wxWindow_PopEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

+    wxEvtHandler * _result;

     wxWindow * _arg0;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    bool  _arg1 = (bool ) FALSE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) FALSE;
+    char *_kwnames[] = { "self","deleteHandler", NULL };
+    char _ptemp[128];

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_Raise",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxWindow_PopEventHandler",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Raise. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_PopEventHandler. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxWindow_Raise(_arg0);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
+    _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxEvtHandler *)wxWindow_PopEventHandler(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxEvtHandler_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_Refresh(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Refresh(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_Refresh(PyObject *self, PyObject *args) {
+#define wxWindow_PushEventHandler(_swigobj,_swigarg0)  (_swigobj->PushEventHandler(_swigarg0))
+static PyObject *_wrap_wxWindow_PushEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _arg0;

-    bool  _arg1 = (1);
-    wxRect * _arg2 = NULL;
-    char * _argc0 = 0;
-    int tempbool1;
-    char * _argc2 = 0;
+    wxEvtHandler * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","handler", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|is:wxWindow_Refresh",&_argc0,&tempbool1,&_argc2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_PushEventHandler",_kwnames,&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Refresh. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_PushEventHandler. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _arg1 = (bool ) tempbool1;
-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxRect_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxWindow_Refresh. Expected _wxRect_p.");
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxEvtHandler_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_PushEventHandler. Expected _wxEvtHandler_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxWindow_Refresh(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_PushEventHandler(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
     _resultobj = Py_None;
     return _resultobj;
 }
 

-#define wxWindow_ReleaseMouse(_swigobj)  (_swigobj->ReleaseMouse())
-static PyObject *_wrap_wxWindow_ReleaseMouse(PyObject *self, PyObject *args) {
+#define wxWindow_PopupMenuXY(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->PopupMenu(_swigarg0,_swigarg1,_swigarg2))
+static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

+    bool  _result;

     wxWindow * _arg0;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    wxMenu * _arg1;
+    int  _arg2;
+    int  _arg3;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","menu","x","y", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_ReleaseMouse",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOii:wxWindow_PopupMenuXY",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ReleaseMouse. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_PopupMenuXY. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxWindow_ReleaseMouse(_arg0);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenu_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_PopupMenuXY. Expected _wxMenu_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_PopupMenuXY(_arg0,_arg1,_arg2,_arg3);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_ScreenToClient(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ScreenToClient(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args) {
+#define wxWindow_PopupMenu(_swigobj,_swigarg0,_swigarg1)  (_swigobj->PopupMenu(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

+    bool  _result;

     wxWindow * _arg0;
     wxWindow * _arg0;

-    int * _arg1;
-    int * _arg2;
-    char * _argc0 = 0;
-    int  temp;
-    PyObject * _obj1 = 0;
-    int  temp0;
-    PyObject * _obj2 = 0;
+    wxMenu * _arg1;
+    wxPoint * _arg2;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","menu","pos", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOO:wxWindow_ScreenToClient",&_argc0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxWindow_PopupMenu",_kwnames,&_argo0,&_argo1,&_argo2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScreenToClient. Expected _wxWindow_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_PopupMenu. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenu_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_PopupMenu. Expected _wxMenu_p.");
+        return NULL;
+        }
+    }
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxWindow_PopupMenu. Expected _wxPoint_p.");

         return NULL;
         }
     }
 {
         return NULL;
         }
     }
 {

-  temp = (int) PyInt_AsLong(_obj1);
-  _arg1 = &temp;
-}
-{
-  temp0 = (int) PyInt_AsLong(_obj2);
-  _arg2 = &temp0;
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_PopupMenu(_arg0,_arg1,*_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;

 }
 }

-    wxWindow_ScreenToClient(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-{
-    PyObject *o;
-    o = PyInt_FromLong((long) (*_arg1));
-    _resultobj = t_output_helper(_resultobj, o);
+
+#define wxWindow_Raise(_swigobj)  (_swigobj->Raise())
+static PyObject *_wrap_wxWindow_Raise(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Raise",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Raise. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_Raise(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxWindow_Refresh(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Refresh(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_Refresh(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    bool  _arg1 = (bool ) TRUE;
+    wxRect * _arg2 = (wxRect *) NULL;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;
+    PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","eraseBackground","rect", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iO:wxWindow_Refresh",_kwnames,&_argo0,&tempbool1,&_argo2)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Refresh. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxRect_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxWindow_Refresh. Expected _wxRect_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_Refresh(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxWindow_ReleaseMouse(_swigobj)  (_swigobj->ReleaseMouse())
+static PyObject *_wrap_wxWindow_ReleaseMouse(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_ReleaseMouse",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ReleaseMouse. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_ReleaseMouse(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxWindow_Reparent(_swigobj,_swigarg0)  (_swigobj->Reparent(_swigarg0))
+static PyObject *_wrap_wxWindow_Reparent(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxWindow * _arg0;
+    wxWindow * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","newParent", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_Reparent",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Reparent. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_Reparent. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_Reparent(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxWindow_ScreenToClientXY(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ScreenToClient(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_ScreenToClientXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    int * _arg1;
+    int * _arg2;
+    PyObject * _argo0 = 0;
+    int  temp;
+    PyObject * _obj1 = 0;
+    int  temp0;
+    PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxWindow_ScreenToClientXY",_kwnames,&_argo0,&_obj1,&_obj2)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScreenToClientXY. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+  temp = (int) PyInt_AsLong(_obj1);
+  _arg1 = &temp;
+}
+{
+  temp0 = (int) PyInt_AsLong(_obj2);
+  _arg2 = &temp0;
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_ScreenToClientXY(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg1));
+    _resultobj = t_output_helper(_resultobj, o);

 }
 {
     PyObject *o;
 }
 {
     PyObject *o;


@@ -1488,257 +2494,362 @@ static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxWindow_ScreenToClient(_swigobj,_swigarg0)  (_swigobj->ScreenToClient(_swigarg0))
+static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxPoint * _result;
+    wxWindow * _arg0;
+    wxPoint * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ScreenToClient",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScreenToClient. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ScreenToClient. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxPoint (wxWindow_ScreenToClient(_arg0,*_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 #define wxWindow_ScrollWindow(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->ScrollWindow(_swigarg0,_swigarg1,_swigarg2))
 #define wxWindow_ScrollWindow(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->ScrollWindow(_swigarg0,_swigarg1,_swigarg2))

-static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;

-    wxRect * _arg3 = NULL;
-    char * _argc0 = 0;
-    char * _argc3 = 0;
+    wxRect * _arg3 = (wxRect *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo3 = 0;
+    char *_kwnames[] = { "self","dx","dy","rect", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii|s:wxWindow_ScrollWindow",&_argc0,&_arg1,&_arg2,&_argc3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|O:wxWindow_ScrollWindow",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScrollWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScrollWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxRect_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxRect_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxWindow_ScrollWindow. Expected _wxRect_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxWindow_ScrollWindow. Expected _wxRect_p.");
         return NULL;
         }
     }

-    wxWindow_ScrollWindow(_arg0,_arg1,_arg2,_arg3);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_ScrollWindow(_arg0,_arg1,_arg2,_arg3);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxWindow_SetAcceleratorTable(_swigobj,_swigarg0)  (_swigobj->SetAcceleratorTable(_swigarg0))
+static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxAcceleratorTable * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","accel", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetAcceleratorTable",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetAcceleratorTable. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxAcceleratorTable_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetAcceleratorTable. Expected _wxAcceleratorTable_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetAcceleratorTable(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetAutoLayout(_swigobj,_swigarg0)  (_swigobj->SetAutoLayout(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetAutoLayout(_swigobj,_swigarg0)  (_swigobj->SetAutoLayout(_swigarg0))

-static PyObject *_wrap_wxWindow_SetAutoLayout(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetAutoLayout(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
     int tempbool1;

+    char *_kwnames[] = { "self","autoLayout", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_SetAutoLayout",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_SetAutoLayout",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetAutoLayout. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetAutoLayout. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;

-    wxWindow_SetAutoLayout(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetAutoLayout(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetBackgroundColour(_swigobj,_swigarg0)  (_swigobj->SetBackgroundColour(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetBackgroundColour(_swigobj,_swigarg0)  (_swigobj->SetBackgroundColour(_swigarg0))

-static PyObject *_wrap_wxWindow_SetBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetBackgroundColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetBackgroundColour",_kwnames,&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetBackgroundColour. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetBackgroundColour. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetBackgroundColour. Expected _wxColour_p.");
         return NULL;
         }
     }

-    wxWindow_SetBackgroundColour(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetBackgroundColour(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetConstraints(_swigobj,_swigarg0)  (_swigobj->SetConstraints(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetConstraints(_swigobj,_swigarg0)  (_swigobj->SetConstraints(_swigarg0))

-static PyObject *_wrap_wxWindow_SetConstraints(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetConstraints(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     wxLayoutConstraints * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxLayoutConstraints * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","constraints", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetConstraints",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetConstraints",_kwnames,&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetConstraints. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetConstraints. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxLayoutConstraints_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxLayoutConstraints_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetConstraints. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetConstraints. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
     }

-    wxWindow_SetConstraints(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxWindow_SetDoubleClick(_swigobj,_swigarg0)  (_swigobj->SetDoubleClick(_swigarg0))
-static PyObject *_wrap_wxWindow_SetDoubleClick(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxWindow * _arg0;
-    bool  _arg1;
-    char * _argc0 = 0;
-    int tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetConstraints(_arg0,_arg1);

 
 

-    self = self;
-    if(!PyArg_ParseTuple(args,"si:wxWindow_SetDoubleClick",&_argc0,&tempbool1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetDoubleClick. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-    _arg1 = (bool ) tempbool1;
-    wxWindow_SetDoubleClick(_arg0,_arg1);
-    Py_INCREF(Py_None);
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetFocus(_swigobj)  (_swigobj->SetFocus())
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetFocus(_swigobj)  (_swigobj->SetFocus())

-static PyObject *_wrap_wxWindow_SetFocus(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetFocus(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_SetFocus",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_SetFocus",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetFocus. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetFocus. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_SetFocus(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetFocus(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetFont(_swigobj,_swigarg0)  (_swigobj->SetFont(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetFont(_swigobj,_swigarg0)  (_swigobj->SetFont(_swigarg0))

-static PyObject *_wrap_wxWindow_SetFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     wxFont * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxFont * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetFont",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetFont",_kwnames,&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetFont. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetFont. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFont_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetFont. Expected _wxFont_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetFont. Expected _wxFont_p.");
         return NULL;
         }
     }

-    wxWindow_SetFont(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetFont(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetForegroundColour(_swigobj,_swigarg0)  (_swigobj->SetForegroundColour(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetForegroundColour(_swigobj,_swigarg0)  (_swigobj->SetForegroundColour(_swigarg0))

-static PyObject *_wrap_wxWindow_SetForegroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     wxColour * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxColour * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetForegroundColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetForegroundColour",_kwnames,&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetForegroundColour. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetForegroundColour. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetForegroundColour. Expected _wxColour_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetForegroundColour. Expected _wxColour_p.");
         return NULL;
         }
     }

-    wxWindow_SetForegroundColour(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetForegroundColour(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetId(_swigobj,_swigarg0)  (_swigobj->SetId(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetId(_swigobj,_swigarg0)  (_swigobj->SetId(_swigarg0))

-static PyObject *_wrap_wxWindow_SetId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_SetId",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_SetId",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetId. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetId. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_SetId(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetId(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetName(_swigobj,_swigarg0)  (_swigobj->SetName(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetName(_swigobj,_swigarg0)  (_swigobj->SetName(_swigarg0))

-static PyObject *_wrap_wxWindow_SetName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetName(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

+    char *_kwnames[] = { "self","name", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxWindow_SetName",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetName",_kwnames,&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetName. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetName. Expected _wxWindow_p.");
         return NULL;
         }


@@ -1748,10 +2859,14 @@ static PyObject *_wrap_wxWindow_SetName(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));

 }
 }

-    wxWindow_SetName(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetName(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj1)
     _resultobj = Py_None;
 {
     if (_obj1)


@@ -1760,104 +2875,100 @@ static PyObject *_wrap_wxWindow_SetName(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_SetReturnCode(_swigobj,_swigarg0)  (_swigobj->SetReturnCode(_swigarg0))
-static PyObject *_wrap_wxWindow_SetReturnCode(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxWindow * _arg0;
-    int  _arg1;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"si:wxWindow_SetReturnCode",&_argc0,&_arg1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetReturnCode. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-    wxWindow_SetReturnCode(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-

 #define wxWindow_SetScrollbar(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->SetScrollbar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
 #define wxWindow_SetScrollbar(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->SetScrollbar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))

-static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     int  _arg3;
     int  _arg4;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     int  _arg3;
     int  _arg4;

-    bool  _arg5 = (1);
-    char * _argc0 = 0;
-    int tempbool5;
+    bool  _arg5 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool5 = (int) TRUE;
+    char *_kwnames[] = { "self","orientation","position","thumbSize","range","refresh", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siiii|i:wxWindow_SetScrollbar",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|i:wxWindow_SetScrollbar",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetScrollbar. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg5 = (bool ) tempbool5;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetScrollbar. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg5 = (bool ) tempbool5;

-    wxWindow_SetScrollbar(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetScrollbar(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetScrollPos(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SetScrollPos(_swigarg0,_swigarg1,_swigarg2))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetScrollPos(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SetScrollPos(_swigarg0,_swigarg1,_swigarg2))

-static PyObject *_wrap_wxWindow_SetScrollPos(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetScrollPos(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;

-    bool  _arg3 = (1);
-    char * _argc0 = 0;
-    int tempbool3;
+    bool  _arg3 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool3 = (int) TRUE;
+    char *_kwnames[] = { "self","orientation","pos","refresh", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii|i:wxWindow_SetScrollPos",&_argc0,&_arg1,&_arg2,&tempbool3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|i:wxWindow_SetScrollPos",_kwnames,&_argo0,&_arg1,&_arg2,&tempbool3)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetScrollPos. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg3 = (bool ) tempbool3;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetScrollPos. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg3 = (bool ) tempbool3;

-    wxWindow_SetScrollPos(_arg0,_arg1,_arg2,_arg3);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetScrollPos(_arg0,_arg1,_arg2,_arg3);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetDimensions(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->SetSize(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetDimensions(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->SetSize(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))

-static PyObject *_wrap_wxWindow_SetDimensions(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetDimensions(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     int  _arg3;
     int  _arg4;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     int  _arg3;
     int  _arg4;

-    int  _arg5 = (wxSIZE_AUTO);
-    char * _argc0 = 0;
+    int  _arg5 = (int ) wxSIZE_AUTO;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y","width","height","sizeFlags", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siiii|i:wxWindow_SetDimensions",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|i:wxWindow_SetDimensions",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetDimensions. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetDimensions. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_SetDimensions(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetDimensions(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
     _resultobj = Py_None;
     return _resultobj;
 }


@@ -1865,30 +2976,37 @@ static PyObject *_wrap_wxWindow_SetDimensions(PyObject *self, PyObject *args) {
 static void  wxWindow_SetSize(wxWindow *self,const wxSize & size) {
             self->SetSize(size.x, size.y);
         }
 static void  wxWindow_SetSize(wxWindow *self,const wxSize & size) {
             self->SetSize(size.x, size.y);
         }

-static PyObject *_wrap_wxWindow_SetSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     wxSize * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxSize * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","size", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetSize",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetSize",_kwnames,&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetSize. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetSize. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetSize. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetSize. Expected _wxSize_p.");
         return NULL;
         }
     }

-    wxWindow_SetSize(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetSize(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
     _resultobj = Py_None;
     return _resultobj;
 }


@@ -1896,126 +3014,226 @@ static PyObject *_wrap_wxWindow_SetSize(PyObject *self, PyObject *args) {
 static void  wxWindow_SetPosition(wxWindow *self,const wxPoint & pos) {
             self->SetSize(pos.x, pos.y, -1, -1);
         }
 static void  wxWindow_SetPosition(wxWindow *self,const wxPoint & pos) {
             self->SetSize(pos.x, pos.y, -1, -1);
         }

-static PyObject *_wrap_wxWindow_SetPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     wxPoint * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxPoint * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pos", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetPosition",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetPosition",_kwnames,&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetPosition. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetPosition. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetPosition. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetPosition. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    wxWindow_SetPosition(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetPosition(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetSizeHints(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)  (_swigobj->SetSizeHints(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetSizeHints(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)  (_swigobj->SetSizeHints(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))

-static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _arg0;

-    int  _arg1 = -1;
-    int  _arg2 = -1;
-    int  _arg3 = -1;
-    int  _arg4 = -1;
-    int  _arg5 = -1;
-    int  _arg6 = -1;
-    char * _argc0 = 0;
+    int  _arg1 = (int ) -1;
+    int  _arg2 = (int ) -1;
+    int  _arg3 = (int ) -1;
+    int  _arg4 = (int ) -1;
+    int  _arg5 = (int ) -1;
+    int  _arg6 = (int ) -1;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","minW","minH","maxW","maxH","incW","incH", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|iiiiii:wxWindow_SetSizeHints",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iiiiii:wxWindow_SetSizeHints",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetSizeHints. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetSizeHints. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_SetSizeHints(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetSizeHints(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
     _resultobj = Py_None;
     return _resultobj;
 }
 

-#define wxWindow_SetClientSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetClientSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args) {
+#define wxWindow_SetClientSizeWH(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetClientSize(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_SetClientSizeWH(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width","height", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxWindow_SetClientSizeWH",_kwnames,&_argo0,&_arg1,&_arg2)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetClientSizeWH. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetClientSizeWH(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxWindow_SetClientSize(_swigobj,_swigarg0)  (_swigobj->SetClientSize(_swigarg0))
+static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxSize * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","size", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxWindow_SetClientSize",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetClientSize",_kwnames,&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetClientSize. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetClientSize. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_SetClientSize(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetClientSize. Expected _wxSize_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetClientSize(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetCursor(_swigobj,_swigarg0)  (_swigobj->SetCursor(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetCursor(_swigobj,_swigarg0)  (_swigobj->SetCursor(_swigarg0))

-static PyObject *_wrap_wxWindow_SetCursor(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     wxCursor * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxCursor * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","cursor", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetCursor",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetCursor",_kwnames,&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetCursor. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetCursor. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxCursor_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxCursor_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetCursor. Expected _wxCursor_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetCursor. Expected _wxCursor_p.");
         return NULL;
         }
     }

-    wxWindow_SetCursor(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetCursor(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxWindow_SetEventHandler(_swigobj,_swigarg0)  (_swigobj->SetEventHandler(_swigarg0))
+static PyObject *_wrap_wxWindow_SetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxEvtHandler * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","handler", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetEventHandler",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetEventHandler. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxEvtHandler_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetEventHandler. Expected _wxEvtHandler_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetEventHandler(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetTitle(_swigobj,_swigarg0)  (_swigobj->SetTitle(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxWindow_SetTitle(_swigobj,_swigarg0)  (_swigobj->SetTitle(_swigarg0))

-static PyObject *_wrap_wxWindow_SetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

+    char *_kwnames[] = { "self","title", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxWindow_SetTitle",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetTitle",_kwnames,&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetTitle. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetTitle. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2025,10 +3243,14 @@ static PyObject *_wrap_wxWindow_SetTitle(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));

 }
 }

-    wxWindow_SetTitle(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetTitle(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj1)
     _resultobj = Py_None;
 {
     if (_obj1)


@@ -2038,122 +3260,414 @@ static PyObject *_wrap_wxWindow_SetTitle(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_Show(_swigobj,_swigarg0)  (_swigobj->Show(_swigarg0))
 }
 
 #define wxWindow_Show(_swigobj,_swigarg0)  (_swigobj->Show(_swigarg0))

-static PyObject *_wrap_wxWindow_Show(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Show(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
     int tempbool1;

+    char *_kwnames[] = { "self","show", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxWindow_Show",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_Show",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Show. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Show. Expected _wxWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;

-    _result = (bool )wxWindow_Show(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_Show(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxWindow_TransferDataFromWindow(_swigobj)  (_swigobj->TransferDataFromWindow())
     return _resultobj;
 }
 
 #define wxWindow_TransferDataFromWindow(_swigobj)  (_swigobj->TransferDataFromWindow())

-static PyObject *_wrap_wxWindow_TransferDataFromWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_TransferDataFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_TransferDataFromWindow",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_TransferDataFromWindow",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_TransferDataFromWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_TransferDataFromWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (bool )wxWindow_TransferDataFromWindow(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_TransferDataFromWindow(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxWindow_TransferDataToWindow(_swigobj)  (_swigobj->TransferDataToWindow())
     return _resultobj;
 }
 
 #define wxWindow_TransferDataToWindow(_swigobj)  (_swigobj->TransferDataToWindow())

-static PyObject *_wrap_wxWindow_TransferDataToWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_TransferDataToWindow(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_TransferDataToWindow",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_TransferDataToWindow",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_TransferDataToWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_TransferDataToWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (bool )wxWindow_TransferDataToWindow(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_TransferDataToWindow(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxWindow_Validate(_swigobj)  (_swigobj->Validate())
     return _resultobj;
 }
 
 #define wxWindow_Validate(_swigobj)  (_swigobj->Validate())

-static PyObject *_wrap_wxWindow_Validate(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Validate(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxWindow_Validate",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Validate",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Validate. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Validate. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    _result = (bool )wxWindow_Validate(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxWindow_Validate(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxWindow_WarpPointer(_swigobj,_swigarg0,_swigarg1)  (_swigobj->WarpPointer(_swigarg0,_swigarg1))
     return _resultobj;
 }
 
 #define wxWindow_WarpPointer(_swigobj,_swigarg0,_swigarg1)  (_swigobj->WarpPointer(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxWindow_WarpPointer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_WarpPointer(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxWindow_WarpPointer",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxWindow_WarpPointer",_kwnames,&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_WarpPointer. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_WarpPointer. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    wxWindow_WarpPointer(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_WarpPointer(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
     _resultobj = Py_None;
     return _resultobj;
 }
 

-static void *SwigwxPanelTowxWindow(void *ptr) {
-    wxPanel *src;
-    wxWindow *dest;
-    src = (wxPanel *) ptr;
-    dest = (wxWindow *) src;
-    return (void *) dest;
-}
+#define wxWindow_ConvertDialogPointToPixels(_swigobj,_swigarg0)  (_swigobj->ConvertDialogToPixels(_swigarg0))
+static PyObject *_wrap_wxWindow_ConvertDialogPointToPixels(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxPoint * _result;
+    wxWindow * _arg0;
+    wxPoint * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertDialogPointToPixels",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertDialogPointToPixels. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertDialogPointToPixels. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxPoint (wxWindow_ConvertDialogPointToPixels(_arg0,*_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxWindow_ConvertDialogSizeToPixels(_swigobj,_swigarg0)  (_swigobj->ConvertDialogToPixels(_swigarg0))
+static PyObject *_wrap_wxWindow_ConvertDialogSizeToPixels(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxSize * _result;
+    wxWindow * _arg0;
+    wxSize * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","sz", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertDialogSizeToPixels",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertDialogSizeToPixels. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertDialogSizeToPixels. Expected _wxSize_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxSize (wxWindow_ConvertDialogSizeToPixels(_arg0,*_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxWindow_ConvertPixelPointToDialog(_swigobj,_swigarg0)  (_swigobj->ConvertPixelsToDialog(_swigarg0))
+static PyObject *_wrap_wxWindow_ConvertPixelPointToDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxPoint * _result;
+    wxWindow * _arg0;
+    wxPoint * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertPixelPointToDialog",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertPixelPointToDialog. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertPixelPointToDialog. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxPoint (wxWindow_ConvertPixelPointToDialog(_arg0,*_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxWindow_ConvertPixelSizeToDialog(_swigobj,_swigarg0)  (_swigobj->ConvertPixelsToDialog(_swigarg0))
+static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxSize * _result;
+    wxWindow * _arg0;
+    wxSize * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","sz", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertPixelSizeToDialog",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertPixelSizeToDialog. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertPixelSizeToDialog. Expected _wxSize_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxSize (wxWindow_ConvertPixelSizeToDialog(_arg0,*_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxWindow_SetToolTipString(_swigobj,_swigarg0)  (_swigobj->SetToolTip(_swigarg0))
+static PyObject *_wrap_wxWindow_SetToolTipString(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxString * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","tip", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetToolTipString",_kwnames,&_argo0,&_obj1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetToolTipString. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetToolTipString(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxWindow_SetToolTip(_swigobj,_swigarg0)  (_swigobj->SetToolTip(_swigarg0))
+static PyObject *_wrap_wxWindow_SetToolTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxToolTip * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","tooltip", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetToolTip",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetToolTip. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxToolTip_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetToolTip. Expected _wxToolTip_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxWindow_SetToolTip(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxWindow_GetToolTip(_swigobj)  (_swigobj->GetToolTip())
+static PyObject *_wrap_wxWindow_GetToolTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxToolTip * _result;
+    wxWindow * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetToolTip",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetToolTip. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxToolTip *)wxWindow_GetToolTip(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolTip_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
+static void *SwigwxPanelTowxWindow(void *ptr) {
+    wxPanel *src;
+    wxWindow *dest;
+    src = (wxPanel *) ptr;
+    dest = (wxWindow *) src;
+    return (void *) dest;
+}

 
 static void *SwigwxPanelTowxEvtHandler(void *ptr) {
     wxPanel *src;
 
 static void *SwigwxPanelTowxEvtHandler(void *ptr) {
     wxPanel *src;


@@ -2164,64 +3678,153 @@ static void *SwigwxPanelTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxPanel(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxPanel(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
 }
 
 #define new_wxPanel(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxPanel(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))

-static PyObject *_wrap_new_wxPanel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPanel(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxPanel * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     PyObject * _resultobj;
     wxPanel * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxTAB_TRAVERSAL);
-    char * _arg5 = "panel";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxTAB_TRAVERSAL;
+    char * _arg5 = (char *) "panel";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxPanel",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxPanel",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPanel. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPanel. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPanel. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPanel. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxPanel. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxPanel. Expected _wxSize_p.");
         return NULL;
         }
     }

-    _result = (wxPanel *)new_wxPanel(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPanel_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxPanel *)new_wxPanel(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPanel_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 #define wxPanel_InitDialog(_swigobj)  (_swigobj->InitDialog())
     return _resultobj;
 }
 
 #define wxPanel_InitDialog(_swigobj)  (_swigobj->InitDialog())

-static PyObject *_wrap_wxPanel_InitDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPanel_InitDialog(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxPanel * _arg0;
     PyObject * _resultobj;
     wxPanel * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPanel_InitDialog",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPanel_InitDialog",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPanel_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPanel_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPanel_InitDialog. Expected _wxPanel_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPanel_InitDialog. Expected _wxPanel_p.");
         return NULL;
         }
     }

-    wxPanel_InitDialog(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxPanel_InitDialog(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxPanel_GetDefaultItem(_swigobj)  (_swigobj->GetDefaultItem())
+static PyObject *_wrap_wxPanel_GetDefaultItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxButton * _result;
+    wxPanel * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPanel_GetDefaultItem",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPanel_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPanel_GetDefaultItem. Expected _wxPanel_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxButton *)wxPanel_GetDefaultItem(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxButton_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
+#define wxPanel_SetDefaultItem(_swigobj,_swigarg0)  (_swigobj->SetDefaultItem(_swigarg0))
+static PyObject *_wrap_wxPanel_SetDefaultItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxPanel * _arg0;
+    wxButton * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","btn", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPanel_SetDefaultItem",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPanel_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPanel_SetDefaultItem. Expected _wxPanel_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxButton_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPanel_SetDefaultItem. Expected _wxButton_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxPanel_SetDefaultItem(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
     _resultobj = Py_None;
     return _resultobj;
 }


@@ -2251,27 +3854,29 @@ static void *SwigwxDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
 }
 
 #define new_wxDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))

-static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxDialog * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     PyObject * _resultobj;
     wxDialog * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = (wxDEFAULT_DIALOG_STYLE);
-    char * _arg6 = "dialogBox";
-    char * _argc0 = 0;
+    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    long  _arg5 = (long ) wxDEFAULT_DIALOG_STYLE;
+    char * _arg6 = (char *) "dialogBox";
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;
+    char *_kwnames[] = { "parent","id","title","pos","size","style","name", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|ssls:new_wxDialog",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxDialog",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxDialog. Expected _wxWindow_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxDialog. Expected _wxWindow_p.");
         return NULL;
         }


@@ -2281,23 +3886,34 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));

 }
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxDialog. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxDialog. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxDialog. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxDialog. Expected _wxSize_p.");
         return NULL;
         }
     }

-    _result = (wxDialog *)new_wxDialog(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxDialog *)new_wxDialog(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;


@@ -2306,67 +3922,85 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_Centre(_swigobj,_swigarg0)  (_swigobj->Centre(_swigarg0))
 }
 
 #define wxDialog_Centre(_swigobj,_swigarg0)  (_swigobj->Centre(_swigarg0))

-static PyObject *_wrap_wxDialog_Centre(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_Centre(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxDialog * _arg0;
     PyObject * _resultobj;
     wxDialog * _arg0;

-    int  _arg1 = (wxBOTH);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxBOTH;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","direction", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxDialog_Centre",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxDialog_Centre",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_Centre. Expected _wxDialog_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_Centre. Expected _wxDialog_p.");
         return NULL;
         }
     }

-    wxDialog_Centre(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxDialog_Centre(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxDialog_EndModal(_swigobj,_swigarg0)  (_swigobj->EndModal(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxDialog_EndModal(_swigobj,_swigarg0)  (_swigobj->EndModal(_swigarg0))

-static PyObject *_wrap_wxDialog_EndModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_EndModal(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxDialog * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxDialog * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","retCode", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxDialog_EndModal",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDialog_EndModal",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_EndModal. Expected _wxDialog_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_EndModal. Expected _wxDialog_p.");
         return NULL;
         }
     }

-    wxDialog_EndModal(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxDialog_EndModal(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxDialog_GetTitle(_swigobj)  (_swigobj->GetTitle())
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxDialog_GetTitle(_swigobj)  (_swigobj->GetTitle())

-static PyObject *_wrap_wxDialog_GetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxDialog * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDialog_GetTitle",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDialog_GetTitle",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_GetTitle. Expected _wxDialog_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_GetTitle. Expected _wxDialog_p.");
         return NULL;
         }
     }

-    _result = new wxString (wxDialog_GetTitle(_arg0));

 {
 {

+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxDialog_GetTitle(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{

     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {


@@ -2376,108 +4010,134 @@ static PyObject *_wrap_wxDialog_GetTitle(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_Iconize(_swigobj,_swigarg0)  (_swigobj->Iconize(_swigarg0))
 }
 
 #define wxDialog_Iconize(_swigobj,_swigarg0)  (_swigobj->Iconize(_swigarg0))

-static PyObject *_wrap_wxDialog_Iconize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_Iconize(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxDialog * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxDialog * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
     int tempbool1;

+    char *_kwnames[] = { "self","iconize", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxDialog_Iconize",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDialog_Iconize",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_Iconize. Expected _wxDialog_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_Iconize. Expected _wxDialog_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;

-    wxDialog_Iconize(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxDialog_Iconize(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxDialog_IsIconized(_swigobj)  (_swigobj->IsIconized())
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxDialog_IsIconized(_swigobj)  (_swigobj->IsIconized())

-static PyObject *_wrap_wxDialog_IsIconized(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_IsIconized(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxDialog * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDialog_IsIconized",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDialog_IsIconized",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_IsIconized. Expected _wxDialog_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_IsIconized. Expected _wxDialog_p.");
         return NULL;
         }
     }

-    _result = (bool )wxDialog_IsIconized(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxDialog_IsIconized(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxDialog_SetModal(_swigobj,_swigarg0)  (_swigobj->SetModal(_swigarg0))
     return _resultobj;
 }
 
 #define wxDialog_SetModal(_swigobj,_swigarg0)  (_swigobj->SetModal(_swigarg0))

-static PyObject *_wrap_wxDialog_SetModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_SetModal(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxDialog * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     wxDialog * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
     int tempbool1;

+    char *_kwnames[] = { "self","flag", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxDialog_SetModal",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDialog_SetModal",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetModal. Expected _wxDialog_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetModal. Expected _wxDialog_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;

-    wxDialog_SetModal(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxDialog_SetModal(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxDialog_IsModal(_swigobj)  (_swigobj->IsModal())
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxDialog_IsModal(_swigobj)  (_swigobj->IsModal())

-static PyObject *_wrap_wxDialog_IsModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_IsModal(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxDialog * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDialog_IsModal",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDialog_IsModal",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_IsModal. Expected _wxDialog_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_IsModal. Expected _wxDialog_p.");
         return NULL;
         }
     }

-    _result = (bool )wxDialog_IsModal(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxDialog_IsModal(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxDialog_SetTitle(_swigobj,_swigarg0)  (_swigobj->SetTitle(_swigarg0))
     return _resultobj;
 }
 
 #define wxDialog_SetTitle(_swigobj,_swigarg0)  (_swigobj->SetTitle(_swigarg0))

-static PyObject *_wrap_wxDialog_SetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxDialog * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxDialog * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

+    char *_kwnames[] = { "self","title", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxDialog_SetTitle",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDialog_SetTitle",_kwnames,&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetTitle. Expected _wxDialog_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetTitle. Expected _wxDialog_p.");
         return NULL;
         }


@@ -2487,10 +4147,14 @@ static PyObject *_wrap_wxDialog_SetTitle(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));

 }
 }

-    wxDialog_SetTitle(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxDialog_SetTitle(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj1)
     _resultobj = Py_None;
 {
     if (_obj1)


@@ -2500,50 +4164,125 @@ static PyObject *_wrap_wxDialog_SetTitle(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_Show(_swigobj,_swigarg0)  (_swigobj->Show(_swigarg0))
 }
 
 #define wxDialog_Show(_swigobj,_swigarg0)  (_swigobj->Show(_swigarg0))

-static PyObject *_wrap_wxDialog_Show(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_Show(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxDialog * _arg0;
     bool  _arg1;
     PyObject * _resultobj;
     bool  _result;
     wxDialog * _arg0;
     bool  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
     int tempbool1;

+    char *_kwnames[] = { "self","show", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxDialog_Show",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDialog_Show",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_Show. Expected _wxDialog_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_Show. Expected _wxDialog_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;

-    _result = (bool )wxDialog_Show(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxDialog_Show(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
     return _resultobj;
 }
 
 #define wxDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())

-static PyObject *_wrap_wxDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxDialog * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxDialog * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDialog_ShowModal",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_ShowModal. Expected _wxDialog_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_ShowModal. Expected _wxDialog_p.");
         return NULL;
         }
     }

-    _result = (int )wxDialog_ShowModal(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxDialog_ShowModal(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxDialog_GetReturnCode(_swigobj)  (_swigobj->GetReturnCode())
+static PyObject *_wrap_wxDialog_GetReturnCode(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    int  _result;
+    wxDialog * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDialog_GetReturnCode",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_GetReturnCode. Expected _wxDialog_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxDialog_GetReturnCode(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxDialog_SetReturnCode(_swigobj,_swigarg0)  (_swigobj->SetReturnCode(_swigarg0))
+static PyObject *_wrap_wxDialog_SetReturnCode(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxDialog * _arg0;
+    int  _arg1;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","retCode", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDialog_SetReturnCode",_kwnames,&_argo0,&_arg1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetReturnCode. Expected _wxDialog_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxDialog_SetReturnCode(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;

     return _resultobj;
 }
 
     return _resultobj;
 }
 

+static void *SwigwxScrolledWindowTowxPanel(void *ptr) {
+    wxScrolledWindow *src;
+    wxPanel *dest;
+    src = (wxScrolledWindow *) ptr;
+    dest = (wxPanel *) src;
+    return (void *) dest;
+}
+

 static void *SwigwxScrolledWindowTowxWindow(void *ptr) {
     wxScrolledWindow *src;
     wxWindow *dest;
 static void *SwigwxScrolledWindowTowxWindow(void *ptr) {
     wxScrolledWindow *src;
     wxWindow *dest;


@@ -2561,83 +4300,103 @@ static void *SwigwxScrolledWindowTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxScrolledWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxScrolledWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
 }
 
 #define new_wxScrolledWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxScrolledWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))

-static PyObject *_wrap_new_wxScrolledWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxScrolledWindow * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxScrolledWindow * _result;
     wxWindow * _arg0;

-    wxWindowID  _arg1 = -1;
-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxHSCROLL)|(wxVSCROLL);
-    char * _arg5 = "scrolledWindow";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
+    wxWindowID  _arg1 = (wxWindowID ) -1;
+    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    long  _arg4 = (long ) wxHSCROLL|wxVSCROLL;
+    char * _arg5 = (char *) "scrolledWindow";
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|issls:new_wxScrolledWindow",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOls:new_wxScrolledWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxScrolledWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxScrolledWindow. Expected _wxWindow_p.");
         return NULL;
         }
     }

-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxScrolledWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxScrolledWindow. Expected _wxPoint_p.");
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxScrolledWindow. Expected _wxSize_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxScrolledWindow. Expected _wxSize_p.");
         return NULL;
         }
     }

-    _result = (wxScrolledWindow *)new_wxScrolledWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxScrolledWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxScrolledWindow *)new_wxScrolledWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxScrolledWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 #define wxScrolledWindow_EnableScrolling(_swigobj,_swigarg0,_swigarg1)  (_swigobj->EnableScrolling(_swigarg0,_swigarg1))
     return _resultobj;
 }
 
 #define wxScrolledWindow_EnableScrolling(_swigobj,_swigarg0,_swigarg1)  (_swigobj->EnableScrolling(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxScrolledWindow_EnableScrolling(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_EnableScrolling(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     bool  _arg1;
     bool  _arg2;
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     bool  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool1;
     int tempbool2;
     int tempbool1;
     int tempbool2;

+    char *_kwnames[] = { "self","xScrolling","yScrolling", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxScrolledWindow_EnableScrolling",&_argc0,&tempbool1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxScrolledWindow_EnableScrolling",_kwnames,&_argo0,&tempbool1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_EnableScrolling. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
     _arg2 = (bool ) tempbool2;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_EnableScrolling. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
     _arg2 = (bool ) tempbool2;

-    wxScrolledWindow_EnableScrolling(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxScrolledWindow_EnableScrolling(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxScrolledWindow_GetScrollPixelsPerUnit(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetScrollPixelsPerUnit(_swigarg0,_swigarg1))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxScrolledWindow_GetScrollPixelsPerUnit(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetScrollPixelsPerUnit(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxScrolledWindow_GetScrollPixelsPerUnit(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_GetScrollPixelsPerUnit(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int * _arg1;
     int  temp;
     int * _arg2;
     int  temp0;
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int * _arg1;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 {
 
     self = self;
 {


@@ -2646,16 +4405,21 @@ static PyObject *_wrap_wxScrolledWindow_GetScrollPixelsPerUnit(PyObject *self, P
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxScrolledWindow_GetScrollPixelsPerUnit",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrolledWindow_GetScrollPixelsPerUnit",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_GetScrollPixelsPerUnit. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_GetScrollPixelsPerUnit. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }

-    wxScrolledWindow_GetScrollPixelsPerUnit(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxScrolledWindow_GetScrollPixelsPerUnit(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     PyObject *o;
     _resultobj = Py_None;
 {
     PyObject *o;


@@ -2671,14 +4435,15 @@ static PyObject *_wrap_wxScrolledWindow_GetScrollPixelsPerUnit(PyObject *self, P
 }
 
 #define wxScrolledWindow_GetVirtualSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetVirtualSize(_swigarg0,_swigarg1))
 }
 
 #define wxScrolledWindow_GetVirtualSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetVirtualSize(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxScrolledWindow_GetVirtualSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_GetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int * _arg1;
     int  temp;
     int * _arg2;
     int  temp0;
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int * _arg1;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 {
 
     self = self;
 {


@@ -2687,16 +4452,21 @@ static PyObject *_wrap_wxScrolledWindow_GetVirtualSize(PyObject *self, PyObject
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxScrolledWindow_GetVirtualSize",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrolledWindow_GetVirtualSize",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_GetVirtualSize. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_GetVirtualSize. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }

-    wxScrolledWindow_GetVirtualSize(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxScrolledWindow_GetVirtualSize(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     PyObject *o;
     _resultobj = Py_None;
 {
     PyObject *o;


@@ -2712,114 +4482,140 @@ static PyObject *_wrap_wxScrolledWindow_GetVirtualSize(PyObject *self, PyObject
 }
 
 #define wxScrolledWindow_IsRetained(_swigobj)  (_swigobj->IsRetained())
 }
 
 #define wxScrolledWindow_IsRetained(_swigobj)  (_swigobj->IsRetained())

-static PyObject *_wrap_wxScrolledWindow_IsRetained(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_IsRetained(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxScrolledWindow * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxScrolledWindow * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxScrolledWindow_IsRetained",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrolledWindow_IsRetained",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_IsRetained. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_IsRetained. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }

-    _result = (bool )wxScrolledWindow_IsRetained(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxScrolledWindow_IsRetained(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxScrolledWindow_PrepareDC(_swigobj,_swigarg0)  (_swigobj->PrepareDC(_swigarg0))
     return _resultobj;
 }
 
 #define wxScrolledWindow_PrepareDC(_swigobj,_swigarg0)  (_swigobj->PrepareDC(_swigarg0))

-static PyObject *_wrap_wxScrolledWindow_PrepareDC(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_PrepareDC(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     wxDC * _arg1;
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     wxDC * _arg1;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","dc", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxScrolledWindow_PrepareDC",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxScrolledWindow_PrepareDC",_kwnames,&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_PrepareDC. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_PrepareDC. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxDC_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxScrolledWindow_PrepareDC. Expected _wxDC_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxScrolledWindow_PrepareDC. Expected _wxDC_p.");
         return NULL;
         }
     }

-    wxScrolledWindow_PrepareDC(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxScrolledWindow_PrepareDC(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxScrolledWindow_Scroll(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Scroll(_swigarg0,_swigarg1))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxScrolledWindow_Scroll(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Scroll(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxScrolledWindow_Scroll(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_Scroll(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int  _arg1;
     int  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxScrolledWindow_Scroll",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxScrolledWindow_Scroll",_kwnames,&_argo0,&_arg1,&_arg2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_Scroll. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_Scroll. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }

-    wxScrolledWindow_Scroll(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxScrolledWindow_Scroll(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxScrolledWindow_SetScrollbars(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)  (_swigobj->SetScrollbars(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxScrolledWindow_SetScrollbars(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)  (_swigobj->SetScrollbars(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))

-static PyObject *_wrap_wxScrolledWindow_SetScrollbars(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_SetScrollbars(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int  _arg1;
     int  _arg2;
     int  _arg3;
     int  _arg4;
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int  _arg1;
     int  _arg2;
     int  _arg3;
     int  _arg4;

-    int  _arg5 = 0;
-    int  _arg6 = 0;
-    char * _argc0 = 0;
+    int  _arg5 = (int ) 0;
+    int  _arg6 = (int ) 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pixelsPerUnitX","pixelsPerUnitY","noUnitsX","noUnitsY","xPos","yPos", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siiii|ii:wxScrolledWindow_SetScrollbars",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|ii:wxScrolledWindow_SetScrollbars",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_SetScrollbars. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_SetScrollbars. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }

-    wxScrolledWindow_SetScrollbars(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxScrolledWindow_SetScrollbars(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxScrolledWindow_ViewStart(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ViewStart(_swigarg0,_swigarg1))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxScrolledWindow_ViewStart(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ViewStart(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxScrolledWindow_ViewStart(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_ViewStart(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int * _arg1;
     int  temp;
     int * _arg2;
     int  temp0;
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int * _arg1;
     int  temp;
     int * _arg2;
     int  temp0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 {
 
     self = self;
 {


@@ -2828,16 +4624,21 @@ static PyObject *_wrap_wxScrolledWindow_ViewStart(PyObject *self, PyObject *args
 {
   _arg2 = &temp0;
 }
 {
   _arg2 = &temp0;
 }

-    if(!PyArg_ParseTuple(args,"s:wxScrolledWindow_ViewStart",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrolledWindow_ViewStart",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_ViewStart. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_ViewStart. Expected _wxScrolledWindow_p.");
         return NULL;
         }
     }

-    wxScrolledWindow_ViewStart(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxScrolledWindow_ViewStart(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     PyObject *o;
     _resultobj = Py_None;
 {
     PyObject *o;


@@ -2860,16 +4661,18 @@ static void *SwigwxMenuTowxEvtHandler(void *ptr) {
     return (void *) dest;
 }
 
     return (void *) dest;
 }
 

-#define new_wxMenu(_swigarg0) (new wxMenu(_swigarg0))
-static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args) {
+#define new_wxMenu(_swigarg0,_swigarg1) (new wxMenu(_swigarg0,_swigarg1))
+static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenu * _result;
     PyObject * _resultobj;
     wxMenu * _result;

-    wxString * _arg0 = &wxPyEmptyStr;
+    wxString * _arg0 = (wxString *) &wxPyEmptyStr;
+    long  _arg1 = (long ) 0;

     PyObject * _obj0 = 0;
     PyObject * _obj0 = 0;

+    char *_kwnames[] = { "title","style", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"|O:new_wxMenu",&_obj0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|Ol:new_wxMenu",_kwnames,&_obj0,&_arg1)) 

         return NULL;
     if (_obj0)
 {
         return NULL;
     if (_obj0)
 {


@@ -2877,11 +4680,20 @@ static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg0 = new wxString(PyString_AsString(_obj0));
+    _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));

 }
 }

-    _result = (wxMenu *)new_wxMenu(*_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxMenu *)new_wxMenu(*_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
     if (_obj0)
         delete _arg0;
 {
     if (_obj0)
         delete _arg0;


@@ -2890,22 +4702,24 @@ static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_Append(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->Append(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
 }
 
 #define wxMenu_Append(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->Append(_swigarg0,_swigarg1,_swigarg2,_swigarg3))

-static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;

-    wxString * _arg3 = &wxPyEmptyStr;
-    int  _arg4 = (0);
-    char * _argc0 = 0;
+    wxString * _arg3 = (wxString *) &wxPyEmptyStr;
+    int  _arg4 = (int ) FALSE;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;

+    char *_kwnames[] = { "self","id","item","helpString","checkable", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO|Oi:wxMenu_Append",&_argc0,&_arg1,&_obj2,&_obj3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|Oi:wxMenu_Append",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Append. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Append. Expected _wxMenu_p.");
         return NULL;
         }


@@ -2915,7 +4729,7 @@ static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));

 }
     if (_obj3)
 {
 }
     if (_obj3)
 {


@@ -2923,10 +4737,14 @@ static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg3 = new wxString(PyString_AsString(_obj3));
+    _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));

 }
 }

-    wxMenu_Append(_arg0,_arg1,*_arg2,*_arg3,_arg4);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenu_Append(_arg0,_arg1,*_arg2,*_arg3,_arg4);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj2)
     _resultobj = Py_None;
 {
     if (_obj2)


@@ -2940,23 +4758,25 @@ static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_AppendMenu(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->Append(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
 }
 
 #define wxMenu_AppendMenu(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->Append(_swigarg0,_swigarg1,_swigarg2,_swigarg3))

-static PyObject *_wrap_wxMenu_AppendMenu(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_AppendMenu(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxMenu * _arg3;
     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;
     wxMenu * _arg3;

-    wxString * _arg4 = &wxPyEmptyStr;
-    char * _argc0 = 0;
+    wxString * _arg4 = (wxString *) &wxPyEmptyStr;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;

     PyObject * _obj4 = 0;
     PyObject * _obj4 = 0;

+    char *_kwnames[] = { "self","id","item","subMenu","helpString", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siOs|O:wxMenu_AppendMenu",&_argc0,&_arg1,&_obj2,&_argc3,&_obj4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO|O:wxMenu_AppendMenu",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_obj4)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_AppendMenu. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_AppendMenu. Expected _wxMenu_p.");
         return NULL;
         }


@@ -2966,10 +4786,11 @@ static PyObject *_wrap_wxMenu_AppendMenu(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));

 }
 }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxMenu_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxMenu_AppendMenu. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxMenu_AppendMenu. Expected _wxMenu_p.");
         return NULL;
         }


@@ -2980,10 +4801,14 @@ static PyObject *_wrap_wxMenu_AppendMenu(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg4 = new wxString(PyString_AsString(_obj4));
+    _arg4 = new wxString(PyString_AsString(_obj4), PyString_Size(_obj4));

 }
 }

-    wxMenu_AppendMenu(_arg0,_arg1,*_arg2,_arg3,*_arg4);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenu_AppendMenu(_arg0,_arg1,*_arg2,_arg3,*_arg4);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj2)
     _resultobj = Py_None;
 {
     if (_obj2)


@@ -2996,112 +4821,174 @@ static PyObject *_wrap_wxMenu_AppendMenu(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxMenu_AppendItem(_swigobj,_swigarg0)  (_swigobj->Append(_swigarg0))
+static PyObject *_wrap_wxMenu_AppendItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxMenu * _arg0;
+    wxMenuItem * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenu_AppendItem",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_AppendItem. Expected _wxMenu_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenuItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenu_AppendItem. Expected _wxMenuItem_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenu_AppendItem(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+

 #define wxMenu_AppendSeparator(_swigobj)  (_swigobj->AppendSeparator())
 #define wxMenu_AppendSeparator(_swigobj)  (_swigobj->AppendSeparator())

-static PyObject *_wrap_wxMenu_AppendSeparator(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_AppendSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenu * _arg0;
     PyObject * _resultobj;
     wxMenu * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenu_AppendSeparator",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenu_AppendSeparator",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_AppendSeparator. Expected _wxMenu_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_AppendSeparator. Expected _wxMenu_p.");
         return NULL;
         }
     }

-    wxMenu_AppendSeparator(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenu_AppendSeparator(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenu_Break(_swigobj)  (_swigobj->Break())
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenu_Break(_swigobj)  (_swigobj->Break())

-static PyObject *_wrap_wxMenu_Break(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_Break(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenu * _arg0;
     PyObject * _resultobj;
     wxMenu * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenu_Break",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenu_Break",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Break. Expected _wxMenu_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Break. Expected _wxMenu_p.");
         return NULL;
         }
     }

-    wxMenu_Break(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenu_Break(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenu_Check(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Check(_swigarg0,_swigarg1))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenu_Check(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Check(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxMenu_Check(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_Check(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
     int tempbool2;

+    char *_kwnames[] = { "self","id","flag", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxMenu_Check",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxMenu_Check",_kwnames,&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Check. Expected _wxMenu_p.");
         return NULL;
         }
     }
     _arg2 = (bool ) tempbool2;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Check. Expected _wxMenu_p.");
         return NULL;
         }
     }
     _arg2 = (bool ) tempbool2;

-    wxMenu_Check(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenu_Check(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenu_Enable(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Enable(_swigarg0,_swigarg1))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenu_Enable(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Enable(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxMenu_Enable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
     int tempbool2;

+    char *_kwnames[] = { "self","id","enable", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxMenu_Enable",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxMenu_Enable",_kwnames,&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Enable. Expected _wxMenu_p.");
         return NULL;
         }
     }
     _arg2 = (bool ) tempbool2;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Enable. Expected _wxMenu_p.");
         return NULL;
         }
     }
     _arg2 = (bool ) tempbool2;

-    wxMenu_Enable(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenu_Enable(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenu_FindItem(_swigobj,_swigarg0)  (_swigobj->FindItem(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenu_FindItem(_swigobj,_swigarg0)  (_swigobj->FindItem(_swigarg0))

-static PyObject *_wrap_wxMenu_FindItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_FindItem(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxMenu * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     int  _result;
     wxMenu * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

+    char *_kwnames[] = { "self","itemString", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxMenu_FindItem",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenu_FindItem",_kwnames,&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_FindItem. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_FindItem. Expected _wxMenu_p.");
         return NULL;
         }


@@ -3111,10 +4998,14 @@ static PyObject *_wrap_wxMenu_FindItem(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));

 }
 }

-    _result = (int )wxMenu_FindItem(_arg0,*_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxMenu_FindItem(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

 {
     if (_obj1)
         delete _arg1;
 {
     if (_obj1)
         delete _arg1;


@@ -3123,23 +5014,29 @@ static PyObject *_wrap_wxMenu_FindItem(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_GetTitle(_swigobj)  (_swigobj->GetTitle())
 }
 
 #define wxMenu_GetTitle(_swigobj)  (_swigobj->GetTitle())

-static PyObject *_wrap_wxMenu_GetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxMenu * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxMenu * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenu_GetTitle",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenu_GetTitle",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetTitle. Expected _wxMenu_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetTitle. Expected _wxMenu_p.");
         return NULL;
         }
     }

-    _result = new wxString (wxMenu_GetTitle(_arg0));

 {
 {

+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxMenu_GetTitle(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{

     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {


@@ -3149,18 +5046,20 @@ static PyObject *_wrap_wxMenu_GetTitle(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_SetTitle(_swigobj,_swigarg0)  (_swigobj->SetTitle(_swigarg0))
 }
 
 #define wxMenu_SetTitle(_swigobj,_swigarg0)  (_swigobj->SetTitle(_swigarg0))

-static PyObject *_wrap_wxMenu_SetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenu * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxMenu * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

+    char *_kwnames[] = { "self","title", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxMenu_SetTitle",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenu_SetTitle",_kwnames,&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetTitle. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetTitle. Expected _wxMenu_p.");
         return NULL;
         }


@@ -3170,10 +5069,14 @@ static PyObject *_wrap_wxMenu_SetTitle(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));

 }
 }

-    wxMenu_SetTitle(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenu_SetTitle(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj1)
     _resultobj = Py_None;
 {
     if (_obj1)


@@ -3183,48 +5086,65 @@ static PyObject *_wrap_wxMenu_SetTitle(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_FindItemForId(_swigobj,_swigarg0)  (_swigobj->FindItemForId(_swigarg0))
 }
 
 #define wxMenu_FindItemForId(_swigobj,_swigarg0)  (_swigobj->FindItemForId(_swigarg0))

-static PyObject *_wrap_wxMenu_FindItemForId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_FindItemForId(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuItem * _result;
     wxMenu * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxMenuItem * _result;
     wxMenu * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenu_FindItemForId",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenu_FindItemForId",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_FindItemForId. Expected _wxMenu_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_FindItemForId. Expected _wxMenu_p.");
         return NULL;
         }
     }

-    _result = (wxMenuItem *)wxMenu_FindItemForId(_arg0,_arg1);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxMenuItem *)wxMenu_FindItemForId(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 #define wxMenu_GetHelpString(_swigobj,_swigarg0)  (_swigobj->GetHelpString(_swigarg0))
     return _resultobj;
 }
 
 #define wxMenu_GetHelpString(_swigobj,_swigarg0)  (_swigobj->GetHelpString(_swigarg0))

-static PyObject *_wrap_wxMenu_GetHelpString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_GetHelpString(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxMenu * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxString * _result;
     wxMenu * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenu_GetHelpString",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenu_GetHelpString",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetHelpString. Expected _wxMenu_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetHelpString. Expected _wxMenu_p.");
         return NULL;
         }
     }

-    _result = new wxString (wxMenu_GetHelpString(_arg0,_arg1));

 {
 {

+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxMenu_GetHelpString(_arg0,_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}{

     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {


@@ -3234,24 +5154,30 @@ static PyObject *_wrap_wxMenu_GetHelpString(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_GetLabel(_swigobj,_swigarg0)  (_swigobj->GetLabel(_swigarg0))
 }
 
 #define wxMenu_GetLabel(_swigobj,_swigarg0)  (_swigobj->GetLabel(_swigarg0))

-static PyObject *_wrap_wxMenu_GetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxMenu * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxString * _result;
     wxMenu * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenu_GetLabel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenu_GetLabel",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetLabel. Expected _wxMenu_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetLabel. Expected _wxMenu_p.");
         return NULL;
         }
     }

-    _result = new wxString (wxMenu_GetLabel(_arg0,_arg1));

 {
 {

+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxMenu_GetLabel(_arg0,_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}{

     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {


@@ -3261,19 +5187,21 @@ static PyObject *_wrap_wxMenu_GetLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_SetHelpString(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetHelpString(_swigarg0,_swigarg1))
 }
 
 #define wxMenu_SetHelpString(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetHelpString(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxMenu_SetHelpString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_SetHelpString(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

+    char *_kwnames[] = { "self","id","helpString", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxMenu_SetHelpString",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxMenu_SetHelpString",_kwnames,&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetHelpString. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetHelpString. Expected _wxMenu_p.");
         return NULL;
         }


@@ -3283,10 +5211,14 @@ static PyObject *_wrap_wxMenu_SetHelpString(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));

 }
 }

-    wxMenu_SetHelpString(_arg0,_arg1,*_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenu_SetHelpString(_arg0,_arg1,*_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj2)
     _resultobj = Py_None;
 {
     if (_obj2)


@@ -3296,63 +5228,77 @@ static PyObject *_wrap_wxMenu_SetHelpString(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_IsChecked(_swigobj,_swigarg0)  (_swigobj->IsChecked(_swigarg0))
 }
 
 #define wxMenu_IsChecked(_swigobj,_swigarg0)  (_swigobj->IsChecked(_swigarg0))

-static PyObject *_wrap_wxMenu_IsChecked(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_IsChecked(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxMenu * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     bool  _result;
     wxMenu * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenu_IsChecked",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenu_IsChecked",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_IsChecked. Expected _wxMenu_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_IsChecked. Expected _wxMenu_p.");
         return NULL;
         }
     }

-    _result = (bool )wxMenu_IsChecked(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxMenu_IsChecked(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxMenu_IsEnabled(_swigobj,_swigarg0)  (_swigobj->IsEnabled(_swigarg0))
     return _resultobj;
 }
 
 #define wxMenu_IsEnabled(_swigobj,_swigarg0)  (_swigobj->IsEnabled(_swigarg0))

-static PyObject *_wrap_wxMenu_IsEnabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxMenu * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     bool  _result;
     wxMenu * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenu_IsEnabled",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenu_IsEnabled",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_IsEnabled. Expected _wxMenu_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_IsEnabled. Expected _wxMenu_p.");
         return NULL;
         }
     }

-    _result = (bool )wxMenu_IsEnabled(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxMenu_IsEnabled(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxMenu_SetLabel(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabel(_swigarg0,_swigarg1))
     return _resultobj;
 }
 
 #define wxMenu_SetLabel(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabel(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxMenu_SetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

+    char *_kwnames[] = { "self","id","label", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxMenu_SetLabel",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxMenu_SetLabel",_kwnames,&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetLabel. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetLabel. Expected _wxMenu_p.");
         return NULL;
         }


@@ -3362,10 +5308,14 @@ static PyObject *_wrap_wxMenu_SetLabel(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));

 }
 }

-    wxMenu_SetLabel(_arg0,_arg1,*_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenu_SetLabel(_arg0,_arg1,*_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj2)
     _resultobj = Py_None;
 {
     if (_obj2)


@@ -3374,74 +5324,67 @@ static PyObject *_wrap_wxMenu_SetLabel(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-static void *SwigwxPyMenuTowxMenu(void *ptr) {
-    wxPyMenu *src;
-    wxMenu *dest;
-    src = (wxPyMenu *) ptr;
-    dest = (wxMenu *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxPyMenuTowxEvtHandler(void *ptr) {
-    wxPyMenu *src;
-    wxEvtHandler *dest;
-    src = (wxPyMenu *) ptr;
-    dest = (wxEvtHandler *) src;
-    return (void *) dest;
-}
-
-#define new_wxPyMenu(_swigarg0,_swigarg1) (new wxPyMenu(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxPyMenu(PyObject *self, PyObject *args) {
+#define wxMenu_UpdateUI(_swigobj,_swigarg0)  (_swigobj->UpdateUI(_swigarg0))
+static PyObject *_wrap_wxMenu_UpdateUI(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxPyMenu * _result;
-    wxString * _arg0 = &wxPyEmptyStr;
-    PyObject * _arg1 = NULL;
-    PyObject * _obj0 = 0;
-    PyObject * _obj1 = 0;
-    char _ptemp[128];
+    wxMenu * _arg0;
+    wxEvtHandler * _arg1 = (wxEvtHandler *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","source", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"|OO:new_wxPyMenu",&_obj0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxMenu_UpdateUI",_kwnames,&_argo0,&_argo1)) 

         return NULL;
         return NULL;

-    if (_obj0)
-{
-    if (!PyString_Check(_obj0)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_UpdateUI. Expected _wxMenu_p.");

         return NULL;
         return NULL;

+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxEvtHandler_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenu_UpdateUI. Expected _wxEvtHandler_p.");
+        return NULL;
+        }

     }
     }

-    _arg0 = new wxString(PyString_AsString(_obj0));
-}
-    if (_obj1)
-{
-  _arg1 = _obj1;
-}
-    _result = (wxPyMenu *)new_wxPyMenu(*_arg0,_arg1);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyMenu_p");
-    _resultobj = Py_BuildValue("s",_ptemp);

 {
 {

-    if (_obj0)
-        delete _arg0;
-}
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenu_UpdateUI(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define delete_wxPyMenu(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxPyMenu(PyObject *self, PyObject *args) {
+static void  wxMenu_Destroy(wxMenu *self) {
+            delete self;
+        }
+static PyObject *_wrap_wxMenu_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxPyMenu * _arg0;
-    char * _argc0 = 0;
+    wxMenu * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:delete_wxPyMenu",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenu_Destroy",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyMenu_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPyMenu. Expected _wxPyMenu_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Destroy. Expected _wxMenu_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    delete_wxPyMenu(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenu_Destroy(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
     _resultobj = Py_None;
     return _resultobj;
 }


@@ -3455,41 +5398,54 @@ static void *SwigwxMenuBarTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxMenuBar() (new wxMenuBar())
 }
 
 #define new_wxMenuBar() (new wxMenuBar())

-static PyObject *_wrap_new_wxMenuBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxMenuBar(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuBar * _result;
     PyObject * _resultobj;
     wxMenuBar * _result;

+    char *_kwnames[] = {  NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,":new_wxMenuBar")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxMenuBar",_kwnames)) 

         return NULL;
         return NULL;

-    _result = (wxMenuBar *)new_wxMenuBar();
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxMenuBar *)new_wxMenuBar();
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 #define wxMenuBar_Append(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Append(_swigarg0,_swigarg1))
     return _resultobj;
 }
 
 #define wxMenuBar_Append(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Append(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxMenuBar_Append(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_Append(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuBar * _arg0;
     wxMenu * _arg1;
     wxString * _arg2;
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     wxMenu * _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

+    char *_kwnames[] = { "self","menu","title", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ssO:wxMenuBar_Append",&_argc0,&_argc1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxMenuBar_Append",_kwnames,&_argo0,&_argo1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Append. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Append. Expected _wxMenuBar_p.");
         return NULL;
         }
     }

-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenu_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenu_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuBar_Append. Expected _wxMenu_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuBar_Append. Expected _wxMenu_p.");
         return NULL;
         }


@@ -3499,10 +5455,14 @@ static PyObject *_wrap_wxMenuBar_Append(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));

 }
 }

-    wxMenuBar_Append(_arg0,_arg1,*_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuBar_Append(_arg0,_arg1,*_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj2)
     _resultobj = Py_None;
 {
     if (_obj2)


@@ -3512,115 +5472,141 @@ static PyObject *_wrap_wxMenuBar_Append(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_Check(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Check(_swigarg0,_swigarg1))
 }
 
 #define wxMenuBar_Check(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Check(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxMenuBar_Check(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_Check(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
     int tempbool2;

+    char *_kwnames[] = { "self","id","flag", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxMenuBar_Check",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxMenuBar_Check",_kwnames,&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Check. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
     _arg2 = (bool ) tempbool2;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Check. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
     _arg2 = (bool ) tempbool2;

-    wxMenuBar_Check(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuBar_Check(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenuBar_Checked(_swigobj,_swigarg0)  (_swigobj->Checked(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenuBar_Checked(_swigobj,_swigarg0)  (_swigobj->Checked(_swigarg0))

-static PyObject *_wrap_wxMenuBar_Checked(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_Checked(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     bool  _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_Checked",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_Checked",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Checked. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Checked. Expected _wxMenuBar_p.");
         return NULL;
         }
     }

-    _result = (bool )wxMenuBar_Checked(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxMenuBar_Checked(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxMenuBar_Enable(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Enable(_swigarg0,_swigarg1))
     return _resultobj;
 }
 
 #define wxMenuBar_Enable(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Enable(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxMenuBar_Enable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
     int tempbool2;

+    char *_kwnames[] = { "self","id","enable", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxMenuBar_Enable",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxMenuBar_Enable",_kwnames,&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Enable. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
     _arg2 = (bool ) tempbool2;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Enable. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
     _arg2 = (bool ) tempbool2;

-    wxMenuBar_Enable(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuBar_Enable(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenuBar_Enabled(_swigobj,_swigarg0)  (_swigobj->Enabled(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenuBar_Enabled(_swigobj,_swigarg0)  (_swigobj->Enabled(_swigarg0))

-static PyObject *_wrap_wxMenuBar_Enabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_Enabled(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     bool  _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_Enabled",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_Enabled",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Enabled. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Enabled. Expected _wxMenuBar_p.");
         return NULL;
         }
     }

-    _result = (bool )wxMenuBar_Enabled(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxMenuBar_Enabled(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxMenuBar_FindMenuItem(_swigobj,_swigarg0,_swigarg1)  (_swigobj->FindMenuItem(_swigarg0,_swigarg1))
     return _resultobj;
 }
 
 #define wxMenuBar_FindMenuItem(_swigobj,_swigarg0,_swigarg1)  (_swigobj->FindMenuItem(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxMenuBar * _arg0;
     wxString * _arg1;
     wxString * _arg2;
     PyObject * _resultobj;
     int  _result;
     wxMenuBar * _arg0;
     wxString * _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;

+    char *_kwnames[] = { "self","menuString","itemString", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOO:wxMenuBar_FindMenuItem",&_argc0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxMenuBar_FindMenuItem",_kwnames,&_argo0,&_obj1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_FindMenuItem. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_FindMenuItem. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -3630,17 +5616,21 @@ static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));

 }
 {
     if (!PyString_Check(_obj2)) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
 }
 {
     if (!PyString_Check(_obj2)) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));

 }
 }

-    _result = (int )wxMenuBar_FindMenuItem(_arg0,*_arg1,*_arg2);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxMenuBar_FindMenuItem(_arg0,*_arg1,*_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

 {
     if (_obj1)
         delete _arg1;
 {
     if (_obj1)
         delete _arg1;


@@ -3653,73 +5643,96 @@ static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_FindItemForId(_swigobj,_swigarg0)  (_swigobj->FindItemForId(_swigarg0))
 }
 
 #define wxMenuBar_FindItemForId(_swigobj,_swigarg0)  (_swigobj->FindItemForId(_swigarg0))

-static PyObject *_wrap_wxMenuBar_FindItemForId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_FindItemForId(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuItem * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxMenuItem * _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_FindItemForId",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_FindItemForId",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_FindItemForId. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_FindItemForId. Expected _wxMenuBar_p.");
         return NULL;
         }
     }

-    _result = (wxMenuItem *)wxMenuBar_FindItemForId(_arg0,_arg1);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxMenuItem *)wxMenuBar_FindItemForId(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 #define wxMenuBar_EnableTop(_swigobj,_swigarg0,_swigarg1)  (_swigobj->EnableTop(_swigarg0,_swigarg1))
     return _resultobj;
 }
 
 #define wxMenuBar_EnableTop(_swigobj,_swigarg0,_swigarg1)  (_swigobj->EnableTop(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxMenuBar_EnableTop(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_EnableTop(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     int tempbool2;
     int tempbool2;

+    char *_kwnames[] = { "self","pos","enable", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxMenuBar_EnableTop",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxMenuBar_EnableTop",_kwnames,&_argo0,&_arg1,&tempbool2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_EnableTop. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
     _arg2 = (bool ) tempbool2;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_EnableTop. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
     _arg2 = (bool ) tempbool2;

-    wxMenuBar_EnableTop(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuBar_EnableTop(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenuBar_GetHelpString(_swigobj,_swigarg0)  (_swigobj->GetHelpString(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenuBar_GetHelpString(_swigobj,_swigarg0)  (_swigobj->GetHelpString(_swigarg0))

-static PyObject *_wrap_wxMenuBar_GetHelpString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_GetHelpString(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_GetHelpString",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_GetHelpString",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetHelpString. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetHelpString. Expected _wxMenuBar_p.");
         return NULL;
         }
     }

-    _result = new wxString (wxMenuBar_GetHelpString(_arg0,_arg1));

 {
 {

+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxMenuBar_GetHelpString(_arg0,_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}{

     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {


@@ -3729,24 +5742,30 @@ static PyObject *_wrap_wxMenuBar_GetHelpString(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_GetLabel(_swigobj,_swigarg0)  (_swigobj->GetLabel(_swigarg0))
 }
 
 #define wxMenuBar_GetLabel(_swigobj,_swigarg0)  (_swigobj->GetLabel(_swigarg0))

-static PyObject *_wrap_wxMenuBar_GetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_GetLabel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_GetLabel",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetLabel. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetLabel. Expected _wxMenuBar_p.");
         return NULL;
         }
     }

-    _result = new wxString (wxMenuBar_GetLabel(_arg0,_arg1));

 {
 {

+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxMenuBar_GetLabel(_arg0,_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}{

     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {


@@ -3756,19 +5775,21 @@ static PyObject *_wrap_wxMenuBar_GetLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_SetHelpString(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetHelpString(_swigarg0,_swigarg1))
 }
 
 #define wxMenuBar_SetHelpString(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetHelpString(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxMenuBar_SetHelpString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_SetHelpString(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

+    char *_kwnames[] = { "self","id","helpString", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxMenuBar_SetHelpString",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxMenuBar_SetHelpString",_kwnames,&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetHelpString. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetHelpString. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -3778,10 +5799,14 @@ static PyObject *_wrap_wxMenuBar_SetHelpString(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));

 }
 }

-    wxMenuBar_SetHelpString(_arg0,_arg1,*_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuBar_SetHelpString(_arg0,_arg1,*_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj2)
     _resultobj = Py_None;
 {
     if (_obj2)


@@ -3791,19 +5816,21 @@ static PyObject *_wrap_wxMenuBar_SetHelpString(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_SetLabel(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabel(_swigarg0,_swigarg1))
 }
 
 #define wxMenuBar_SetLabel(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabel(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxMenuBar_SetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

+    char *_kwnames[] = { "self","id","label", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxMenuBar_SetLabel",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxMenuBar_SetLabel",_kwnames,&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetLabel. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetLabel. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -3813,10 +5840,14 @@ static PyObject *_wrap_wxMenuBar_SetLabel(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));

 }
 }

-    wxMenuBar_SetLabel(_arg0,_arg1,*_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuBar_SetLabel(_arg0,_arg1,*_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj2)
     _resultobj = Py_None;
 {
     if (_obj2)


@@ -3826,24 +5857,30 @@ static PyObject *_wrap_wxMenuBar_SetLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_GetLabelTop(_swigobj,_swigarg0)  (_swigobj->GetLabelTop(_swigarg0))
 }
 
 #define wxMenuBar_GetLabelTop(_swigobj,_swigarg0)  (_swigobj->GetLabelTop(_swigarg0))

-static PyObject *_wrap_wxMenuBar_GetLabelTop(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_GetLabelTop(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pos", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_GetLabelTop",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_GetLabelTop",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetLabelTop. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetLabelTop. Expected _wxMenuBar_p.");
         return NULL;
         }
     }

-    _result = new wxString (wxMenuBar_GetLabelTop(_arg0,_arg1));

 {
 {

+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxMenuBar_GetLabelTop(_arg0,_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}{

     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {


@@ -3853,19 +5890,21 @@ static PyObject *_wrap_wxMenuBar_GetLabelTop(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_SetLabelTop(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabelTop(_swigarg0,_swigarg1))
 }
 
 #define wxMenuBar_SetLabelTop(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabelTop(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxMenuBar_SetLabelTop(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_SetLabelTop(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

+    char *_kwnames[] = { "self","pos","label", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxMenuBar_SetLabelTop",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxMenuBar_SetLabelTop",_kwnames,&_argo0,&_arg1,&_obj2)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetLabelTop. Expected _wxMenuBar_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetLabelTop. Expected _wxMenuBar_p.");
         return NULL;
         }


@@ -3875,10 +5914,14 @@ static PyObject *_wrap_wxMenuBar_SetLabelTop(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));

 }
 }

-    wxMenuBar_SetLabelTop(_arg0,_arg1,*_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuBar_SetLabelTop(_arg0,_arg1,*_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj2)
     _resultobj = Py_None;
 {
     if (_obj2)


@@ -3888,191 +5931,326 @@ static PyObject *_wrap_wxMenuBar_SetLabelTop(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_GetMenuCount(_swigobj)  (_swigobj->GetMenuCount())
 }
 
 #define wxMenuBar_GetMenuCount(_swigobj)  (_swigobj->GetMenuCount())

-static PyObject *_wrap_wxMenuBar_GetMenuCount(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_GetMenuCount(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxMenuBar * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxMenuBar * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuBar_GetMenuCount",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuBar_GetMenuCount",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetMenuCount. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetMenuCount. Expected _wxMenuBar_p.");
         return NULL;
         }
     }

-    _result = (int )wxMenuBar_GetMenuCount(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxMenuBar_GetMenuCount(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxMenuBar_GetMenu(_swigobj,_swigarg0)  (_swigobj->GetMenu(_swigarg0))
     return _resultobj;
 }
 
 #define wxMenuBar_GetMenu(_swigobj,_swigarg0)  (_swigobj->GetMenu(_swigarg0))

-static PyObject *_wrap_wxMenuBar_GetMenu(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_GetMenu(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenu * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxMenu * _result;
     wxMenuBar * _arg0;
     int  _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","i", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxMenuBar_GetMenu",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_GetMenu",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetMenu. Expected _wxMenuBar_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetMenu. Expected _wxMenuBar_p.");
         return NULL;
         }
     }

-    _result = (wxMenu *)wxMenuBar_GetMenu(_arg0,_arg1);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxMenu *)wxMenuBar_GetMenu(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
+#define new_wxMenuItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxMenuItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
+static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxMenuItem * _result;
+    wxMenu * _arg0 = (wxMenu *) NULL;
+    int  _arg1 = (int ) ID_SEPARATOR;
+    wxString * _arg2 = (wxString *) &wxPyEmptyStr;
+    wxString * _arg3 = (wxString *) &wxPyEmptyStr;
+    bool  _arg4 = (bool ) FALSE;
+    wxMenu * _arg5 = (wxMenu *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _obj2 = 0;
+    PyObject * _obj3 = 0;
+    int tempbool4 = (int) FALSE;
+    PyObject * _argo5 = 0;
+    char *_kwnames[] = { "parentMenu","id","text","helpString","checkable","subMenu", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|OiOOiO:new_wxMenuItem",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&tempbool4,&_argo5)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMenuItem. Expected _wxMenu_p.");
+        return NULL;
+        }
+    }
+    if (_obj2)
+{
+    if (!PyString_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
+}
+    if (_obj3)
+{
+    if (!PyString_Check(_obj3)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));
+}
+    _arg4 = (bool ) tempbool4;
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxMenu_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxMenuItem. Expected _wxMenu_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxMenuItem *)new_wxMenuItem(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+{
+    if (_obj2)
+        delete _arg2;
+}
+{
+    if (_obj3)
+        delete _arg3;
+}

     return _resultobj;
 }
 
 #define wxMenuItem_IsSeparator(_swigobj)  (_swigobj->IsSeparator())
     return _resultobj;
 }
 
 #define wxMenuItem_IsSeparator(_swigobj)  (_swigobj->IsSeparator())

-static PyObject *_wrap_wxMenuItem_IsSeparator(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_IsSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_IsSeparator",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_IsSeparator",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsSeparator. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsSeparator. Expected _wxMenuItem_p.");
         return NULL;
         }
     }

-    _result = (bool )wxMenuItem_IsSeparator(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxMenuItem_IsSeparator(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxMenuItem_IsEnabled(_swigobj)  (_swigobj->IsEnabled())
     return _resultobj;
 }
 
 #define wxMenuItem_IsEnabled(_swigobj)  (_swigobj->IsEnabled())

-static PyObject *_wrap_wxMenuItem_IsEnabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_IsEnabled",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_IsEnabled",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsEnabled. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsEnabled. Expected _wxMenuItem_p.");
         return NULL;
         }
     }

-    _result = (bool )wxMenuItem_IsEnabled(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxMenuItem_IsEnabled(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxMenuItem_IsChecked(_swigobj)  (_swigobj->IsChecked())
     return _resultobj;
 }
 
 #define wxMenuItem_IsChecked(_swigobj)  (_swigobj->IsChecked())

-static PyObject *_wrap_wxMenuItem_IsChecked(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_IsChecked(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_IsChecked",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_IsChecked",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsChecked. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsChecked. Expected _wxMenuItem_p.");
         return NULL;
         }
     }

-    _result = (bool )wxMenuItem_IsChecked(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxMenuItem_IsChecked(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxMenuItem_IsCheckable(_swigobj)  (_swigobj->IsCheckable())
     return _resultobj;
 }
 
 #define wxMenuItem_IsCheckable(_swigobj)  (_swigobj->IsCheckable())

-static PyObject *_wrap_wxMenuItem_IsCheckable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_IsCheckable(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_IsCheckable",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_IsCheckable",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsCheckable. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsCheckable. Expected _wxMenuItem_p.");
         return NULL;
         }
     }

-    _result = (bool )wxMenuItem_IsCheckable(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxMenuItem_IsCheckable(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxMenuItem_GetId(_swigobj)  (_swigobj->GetId())
     return _resultobj;
 }
 
 #define wxMenuItem_GetId(_swigobj)  (_swigobj->GetId())

-static PyObject *_wrap_wxMenuItem_GetId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetId",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetId",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetId. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetId. Expected _wxMenuItem_p.");
         return NULL;
         }
     }

-    _result = (int )wxMenuItem_GetId(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxMenuItem_GetId(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxMenuItem_GetSubMenu(_swigobj)  (_swigobj->GetSubMenu())
     return _resultobj;
 }
 
 #define wxMenuItem_GetSubMenu(_swigobj)  (_swigobj->GetSubMenu())

-static PyObject *_wrap_wxMenuItem_GetSubMenu(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_GetSubMenu(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenu * _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     wxMenu * _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetSubMenu",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetSubMenu",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetSubMenu. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetSubMenu. Expected _wxMenuItem_p.");
         return NULL;
         }
     }

-    _result = (wxMenu *)wxMenuItem_GetSubMenu(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxMenu *)wxMenuItem_GetSubMenu(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
 #define wxMenuItem_SetName(_swigobj,_swigarg0)  (_swigobj->SetName(_swigarg0))
     return _resultobj;
 }
 
 #define wxMenuItem_SetName(_swigobj,_swigarg0)  (_swigobj->SetName(_swigarg0))

-static PyObject *_wrap_wxMenuItem_SetName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_SetName(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

+    char *_kwnames[] = { "self","strName", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxMenuItem_SetName",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetName",_kwnames,&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetName. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetName. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -4082,10 +6260,14 @@ static PyObject *_wrap_wxMenuItem_SetName(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));

 }
 }

-    wxMenuItem_SetName(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuItem_SetName(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj1)
     _resultobj = Py_None;
 {
     if (_obj1)


@@ -4094,88 +6276,85 @@ static PyObject *_wrap_wxMenuItem_SetName(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxMenuItem_DeleteSubMenu(_swigobj)  (_swigobj->DeleteSubMenu())
-static PyObject *_wrap_wxMenuItem_DeleteSubMenu(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxMenuItem * _arg0;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_DeleteSubMenu",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_DeleteSubMenu. Expected _wxMenuItem_p.");
-        return NULL;
-        }
-    }
-    wxMenuItem_DeleteSubMenu(_arg0);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-

 #define wxMenuItem_GetName(_swigobj)  (_swigobj->GetName())
 #define wxMenuItem_GetName(_swigobj)  (_swigobj->GetName())

-static PyObject *_wrap_wxMenuItem_GetName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetName",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetName",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetName. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetName. Expected _wxMenuItem_p.");
         return NULL;
         }
     }

-    const wxString & _result_ref = wxMenuItem_GetName(_arg0);
-    _result = (wxString *) &_result_ref;

 {
 {

-    _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxMenuItem_GetName(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{
+    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+}
+{
+    delete _result;

 }
     return _resultobj;
 }
 
 #define wxMenuItem_GetHelp(_swigobj)  (_swigobj->GetHelp())
 }
     return _resultobj;
 }
 
 #define wxMenuItem_GetHelp(_swigobj)  (_swigobj->GetHelp())

-static PyObject *_wrap_wxMenuItem_GetHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_GetHelp(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     wxString * _result;
     wxMenuItem * _arg0;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetHelp",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetHelp",_kwnames,&_argo0)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetHelp. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetHelp. Expected _wxMenuItem_p.");
         return NULL;
         }
     }

-    const wxString & _result_ref = wxMenuItem_GetHelp(_arg0);
-    _result = (wxString *) &_result_ref;

 {
 {

-    _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxMenuItem_GetHelp(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{
+    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+}
+{
+    delete _result;

 }
     return _resultobj;
 }
 
 #define wxMenuItem_SetHelp(_swigobj,_swigarg0)  (_swigobj->SetHelp(_swigarg0))
 }
     return _resultobj;
 }
 
 #define wxMenuItem_SetHelp(_swigobj,_swigarg0)  (_swigobj->SetHelp(_swigarg0))

-static PyObject *_wrap_wxMenuItem_SetHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_SetHelp(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxString * _arg1;

-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

     PyObject * _obj1 = 0;
     PyObject * _obj1 = 0;

+    char *_kwnames[] = { "self","strHelp", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxMenuItem_SetHelp",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetHelp",_kwnames,&_argo0,&_obj1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetHelp. Expected _wxMenuItem_p.");
         return NULL;
         }
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetHelp. Expected _wxMenuItem_p.");
         return NULL;
         }


@@ -4185,10 +6364,14 @@ static PyObject *_wrap_wxMenuItem_SetHelp(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));

 }
 }

-    wxMenuItem_SetHelp(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuItem_SetHelp(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj1)
     _resultobj = Py_None;
 {
     if (_obj1)


@@ -4198,374 +6381,835 @@ static PyObject *_wrap_wxMenuItem_SetHelp(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_Enable(_swigobj,_swigarg0)  (_swigobj->Enable(_swigarg0))
 }
 
 #define wxMenuItem_Enable(_swigobj,_swigarg0)  (_swigobj->Enable(_swigarg0))

-static PyObject *_wrap_wxMenuItem_Enable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     wxMenuItem * _arg0;

-    bool  _arg1 = (1);
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;
+    char *_kwnames[] = { "self","bDoEnable", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxMenuItem_Enable",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxMenuItem_Enable",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_Enable. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_Enable. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;

-    wxMenuItem_Enable(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuItem_Enable(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenuItem_Check(_swigobj,_swigarg0)  (_swigobj->Check(_swigarg0))
     _resultobj = Py_None;
     return _resultobj;
 }
 
 #define wxMenuItem_Check(_swigobj,_swigarg0)  (_swigobj->Check(_swigarg0))

-static PyObject *_wrap_wxMenuItem_Check(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_Check(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxMenuItem * _arg0;
     PyObject * _resultobj;
     wxMenuItem * _arg0;

-    bool  _arg1 = (1);
-    char * _argc0 = 0;
-    int tempbool1;
+    bool  _arg1 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;
+    char *_kwnames[] = { "self","bDoCheck", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s|i:wxMenuItem_Check",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxMenuItem_Check",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
         return NULL;

-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {

             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_Check. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_Check. Expected _wxMenuItem_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;

-    wxMenuItem_Check(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuItem_Check(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxMenuItem_GetBackgroundColour(_swigobj)  (_swigobj->GetBackgroundColour())
+static PyObject *_wrap_wxMenuItem_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxColour * _result;
+    wxMenuItem * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetBackgroundColour",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetBackgroundColour. Expected _wxMenuItem_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxColour & _result_ref = wxMenuItem_GetBackgroundColour(_arg0);
+    _result = (wxColour *) &_result_ref;
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
+#define wxMenuItem_GetBitmap(_swigobj,_swigarg0)  (_swigobj->GetBitmap(_swigarg0))
+static PyObject *_wrap_wxMenuItem_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxBitmap * _result;
+    wxMenuItem * _arg0;
+    bool  _arg1 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) TRUE;
+    char *_kwnames[] = { "self","checked", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxMenuItem_GetBitmap",_kwnames,&_argo0,&tempbool1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetBitmap. Expected _wxMenuItem_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxBitmap (wxMenuItem_GetBitmap(_arg0,_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxBitmap_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxMenuItem_GetFont(_swigobj)  (_swigobj->GetFont())
+static PyObject *_wrap_wxMenuItem_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxFont * _result;
+    wxMenuItem * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetFont",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetFont. Expected _wxMenuItem_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxFont & _result_ref = wxMenuItem_GetFont(_arg0);
+    _result = (wxFont *) &_result_ref;
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
+#define wxMenuItem_GetMarginWidth(_swigobj)  (_swigobj->GetMarginWidth())
+static PyObject *_wrap_wxMenuItem_GetMarginWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    int  _result;
+    wxMenuItem * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetMarginWidth",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetMarginWidth. Expected _wxMenuItem_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxMenuItem_GetMarginWidth(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxMenuItem_GetTextColour(_swigobj)  (_swigobj->GetTextColour())
+static PyObject *_wrap_wxMenuItem_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxColour * _result;
+    wxMenuItem * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetTextColour",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetTextColour. Expected _wxMenuItem_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxColour & _result_ref = wxMenuItem_GetTextColour(_arg0);
+    _result = (wxColour *) &_result_ref;
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
+#define wxMenuItem_SetBackgroundColour(_swigobj,_swigarg0)  (_swigobj->SetBackgroundColour(_swigarg0))
+static PyObject *_wrap_wxMenuItem_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxMenuItem * _arg0;
+    wxColour * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetBackgroundColour",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetBackgroundColour. Expected _wxMenuItem_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetBackgroundColour. Expected _wxColour_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuItem_SetBackgroundColour(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxMenuItem_SetBitmaps(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetBitmaps(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxMenuItem_SetBitmaps(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxMenuItem * _arg0;
+    wxBitmap * _arg1;
+    wxBitmap * _arg2 = (wxBitmap *) &wxNullBitmap;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","checked","unchecked", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxMenuItem_SetBitmaps",_kwnames,&_argo0,&_argo1,&_argo2)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetBitmaps. Expected _wxMenuItem_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetBitmaps. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxMenuItem_SetBitmaps. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuItem_SetBitmaps(_arg0,*_arg1,*_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxMenuItem_SetFont(_swigobj,_swigarg0)  (_swigobj->SetFont(_swigarg0))
+static PyObject *_wrap_wxMenuItem_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxMenuItem * _arg0;
+    wxFont * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetFont",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetFont. Expected _wxMenuItem_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetFont. Expected _wxFont_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuItem_SetFont(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxMenuItem_SetMarginWidth(_swigobj,_swigarg0)  (_swigobj->SetMarginWidth(_swigarg0))
+static PyObject *_wrap_wxMenuItem_SetMarginWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxMenuItem * _arg0;
+    int  _arg1;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuItem_SetMarginWidth",_kwnames,&_argo0,&_arg1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetMarginWidth. Expected _wxMenuItem_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuItem_SetMarginWidth(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxMenuItem_SetTextColour(_swigobj,_swigarg0)  (_swigobj->SetTextColour(_swigarg0))
+static PyObject *_wrap_wxMenuItem_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxMenuItem * _arg0;
+    wxColour * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetTextColour",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetTextColour. Expected _wxMenuItem_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetTextColour. Expected _wxColour_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuItem_SetTextColour(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxMenuItem_DeleteSubMenu(_swigobj)  (_swigobj->DeleteSubMenu())
+static PyObject *_wrap_wxMenuItem_DeleteSubMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxMenuItem * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_DeleteSubMenu",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_DeleteSubMenu. Expected _wxMenuItem_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenuItem_DeleteSubMenu(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
 static PyMethodDef windowscMethods[] = {
     _resultobj = Py_None;
     return _resultobj;
 }
 
 static PyMethodDef windowscMethods[] = {

-        { "wxMenuItem_Check", _wrap_wxMenuItem_Check, 1 },
-        { "wxMenuItem_Enable", _wrap_wxMenuItem_Enable, 1 },
-        { "wxMenuItem_SetHelp", _wrap_wxMenuItem_SetHelp, 1 },
-        { "wxMenuItem_GetHelp", _wrap_wxMenuItem_GetHelp, 1 },
-        { "wxMenuItem_GetName", _wrap_wxMenuItem_GetName, 1 },
-        { "wxMenuItem_DeleteSubMenu", _wrap_wxMenuItem_DeleteSubMenu, 1 },
-        { "wxMenuItem_SetName", _wrap_wxMenuItem_SetName, 1 },
-        { "wxMenuItem_GetSubMenu", _wrap_wxMenuItem_GetSubMenu, 1 },
-        { "wxMenuItem_GetId", _wrap_wxMenuItem_GetId, 1 },
-        { "wxMenuItem_IsCheckable", _wrap_wxMenuItem_IsCheckable, 1 },
-        { "wxMenuItem_IsChecked", _wrap_wxMenuItem_IsChecked, 1 },
-        { "wxMenuItem_IsEnabled", _wrap_wxMenuItem_IsEnabled, 1 },
-        { "wxMenuItem_IsSeparator", _wrap_wxMenuItem_IsSeparator, 1 },
-        { "wxMenuBar_GetMenu", _wrap_wxMenuBar_GetMenu, 1 },
-        { "wxMenuBar_GetMenuCount", _wrap_wxMenuBar_GetMenuCount, 1 },
-        { "wxMenuBar_SetLabelTop", _wrap_wxMenuBar_SetLabelTop, 1 },
-        { "wxMenuBar_GetLabelTop", _wrap_wxMenuBar_GetLabelTop, 1 },
-        { "wxMenuBar_SetLabel", _wrap_wxMenuBar_SetLabel, 1 },
-        { "wxMenuBar_SetHelpString", _wrap_wxMenuBar_SetHelpString, 1 },
-        { "wxMenuBar_GetLabel", _wrap_wxMenuBar_GetLabel, 1 },
-        { "wxMenuBar_GetHelpString", _wrap_wxMenuBar_GetHelpString, 1 },
-        { "wxMenuBar_EnableTop", _wrap_wxMenuBar_EnableTop, 1 },
-        { "wxMenuBar_FindItemForId", _wrap_wxMenuBar_FindItemForId, 1 },
-        { "wxMenuBar_FindMenuItem", _wrap_wxMenuBar_FindMenuItem, 1 },
-        { "wxMenuBar_Enabled", _wrap_wxMenuBar_Enabled, 1 },
-        { "wxMenuBar_Enable", _wrap_wxMenuBar_Enable, 1 },
-        { "wxMenuBar_Checked", _wrap_wxMenuBar_Checked, 1 },
-        { "wxMenuBar_Check", _wrap_wxMenuBar_Check, 1 },
-        { "wxMenuBar_Append", _wrap_wxMenuBar_Append, 1 },
-        { "new_wxMenuBar", _wrap_new_wxMenuBar, 1 },
-        { "delete_wxPyMenu", _wrap_delete_wxPyMenu, 1 },
-        { "new_wxPyMenu", _wrap_new_wxPyMenu, 1 },
-        { "wxMenu_SetLabel", _wrap_wxMenu_SetLabel, 1 },
-        { "wxMenu_IsEnabled", _wrap_wxMenu_IsEnabled, 1 },
-        { "wxMenu_IsChecked", _wrap_wxMenu_IsChecked, 1 },
-        { "wxMenu_SetHelpString", _wrap_wxMenu_SetHelpString, 1 },
-        { "wxMenu_GetLabel", _wrap_wxMenu_GetLabel, 1 },
-        { "wxMenu_GetHelpString", _wrap_wxMenu_GetHelpString, 1 },
-        { "wxMenu_FindItemForId", _wrap_wxMenu_FindItemForId, 1 },
-        { "wxMenu_SetTitle", _wrap_wxMenu_SetTitle, 1 },
-        { "wxMenu_GetTitle", _wrap_wxMenu_GetTitle, 1 },
-        { "wxMenu_FindItem", _wrap_wxMenu_FindItem, 1 },
-        { "wxMenu_Enable", _wrap_wxMenu_Enable, 1 },
-        { "wxMenu_Check", _wrap_wxMenu_Check, 1 },
-        { "wxMenu_Break", _wrap_wxMenu_Break, 1 },
-        { "wxMenu_AppendSeparator", _wrap_wxMenu_AppendSeparator, 1 },
-        { "wxMenu_AppendMenu", _wrap_wxMenu_AppendMenu, 1 },
-        { "wxMenu_Append", _wrap_wxMenu_Append, 1 },
-        { "new_wxMenu", _wrap_new_wxMenu, 1 },
-        { "wxScrolledWindow_ViewStart", _wrap_wxScrolledWindow_ViewStart, 1 },
-        { "wxScrolledWindow_SetScrollbars", _wrap_wxScrolledWindow_SetScrollbars, 1 },
-        { "wxScrolledWindow_Scroll", _wrap_wxScrolledWindow_Scroll, 1 },
-        { "wxScrolledWindow_PrepareDC", _wrap_wxScrolledWindow_PrepareDC, 1 },
-        { "wxScrolledWindow_IsRetained", _wrap_wxScrolledWindow_IsRetained, 1 },
-        { "wxScrolledWindow_GetVirtualSize", _wrap_wxScrolledWindow_GetVirtualSize, 1 },
-        { "wxScrolledWindow_GetScrollPixelsPerUnit", _wrap_wxScrolledWindow_GetScrollPixelsPerUnit, 1 },
-        { "wxScrolledWindow_EnableScrolling", _wrap_wxScrolledWindow_EnableScrolling, 1 },
-        { "new_wxScrolledWindow", _wrap_new_wxScrolledWindow, 1 },
-        { "wxDialog_ShowModal", _wrap_wxDialog_ShowModal, 1 },
-        { "wxDialog_Show", _wrap_wxDialog_Show, 1 },
-        { "wxDialog_SetTitle", _wrap_wxDialog_SetTitle, 1 },
-        { "wxDialog_IsModal", _wrap_wxDialog_IsModal, 1 },
-        { "wxDialog_SetModal", _wrap_wxDialog_SetModal, 1 },
-        { "wxDialog_IsIconized", _wrap_wxDialog_IsIconized, 1 },
-        { "wxDialog_Iconize", _wrap_wxDialog_Iconize, 1 },
-        { "wxDialog_GetTitle", _wrap_wxDialog_GetTitle, 1 },
-        { "wxDialog_EndModal", _wrap_wxDialog_EndModal, 1 },
-        { "wxDialog_Centre", _wrap_wxDialog_Centre, 1 },
-        { "new_wxDialog", _wrap_new_wxDialog, 1 },
-        { "wxPanel_InitDialog", _wrap_wxPanel_InitDialog, 1 },
-        { "new_wxPanel", _wrap_new_wxPanel, 1 },
-        { "wxWindow_WarpPointer", _wrap_wxWindow_WarpPointer, 1 },
-        { "wxWindow_Validate", _wrap_wxWindow_Validate, 1 },
-        { "wxWindow_TransferDataToWindow", _wrap_wxWindow_TransferDataToWindow, 1 },
-        { "wxWindow_TransferDataFromWindow", _wrap_wxWindow_TransferDataFromWindow, 1 },
-        { "wxWindow_Show", _wrap_wxWindow_Show, 1 },
-        { "wxWindow_SetTitle", _wrap_wxWindow_SetTitle, 1 },
-        { "wxWindow_SetCursor", _wrap_wxWindow_SetCursor, 1 },
-        { "wxWindow_SetClientSize", _wrap_wxWindow_SetClientSize, 1 },
-        { "wxWindow_SetSizeHints", _wrap_wxWindow_SetSizeHints, 1 },
-        { "wxWindow_SetPosition", _wrap_wxWindow_SetPosition, 1 },
-        { "wxWindow_SetSize", _wrap_wxWindow_SetSize, 1 },
-        { "wxWindow_SetDimensions", _wrap_wxWindow_SetDimensions, 1 },
-        { "wxWindow_SetScrollPos", _wrap_wxWindow_SetScrollPos, 1 },
-        { "wxWindow_SetScrollbar", _wrap_wxWindow_SetScrollbar, 1 },
-        { "wxWindow_SetReturnCode", _wrap_wxWindow_SetReturnCode, 1 },
-        { "wxWindow_SetName", _wrap_wxWindow_SetName, 1 },
-        { "wxWindow_SetId", _wrap_wxWindow_SetId, 1 },
-        { "wxWindow_SetForegroundColour", _wrap_wxWindow_SetForegroundColour, 1 },
-        { "wxWindow_SetFont", _wrap_wxWindow_SetFont, 1 },
-        { "wxWindow_SetFocus", _wrap_wxWindow_SetFocus, 1 },
-        { "wxWindow_SetDoubleClick", _wrap_wxWindow_SetDoubleClick, 1 },
-        { "wxWindow_SetConstraints", _wrap_wxWindow_SetConstraints, 1 },
-        { "wxWindow_SetBackgroundColour", _wrap_wxWindow_SetBackgroundColour, 1 },
-        { "wxWindow_SetAutoLayout", _wrap_wxWindow_SetAutoLayout, 1 },
-        { "wxWindow_ScrollWindow", _wrap_wxWindow_ScrollWindow, 1 },
-        { "wxWindow_ScreenToClient", _wrap_wxWindow_ScreenToClient, 1 },
-        { "wxWindow_ReleaseMouse", _wrap_wxWindow_ReleaseMouse, 1 },
-        { "wxWindow_Refresh", _wrap_wxWindow_Refresh, 1 },
-        { "wxWindow_Raise", _wrap_wxWindow_Raise, 1 },
-        { "wxWindow_PopupMenu", _wrap_wxWindow_PopupMenu, 1 },
-        { "wxWindow_Move", _wrap_wxWindow_Move, 1 },
-        { "wxWindow_MakeModal", _wrap_wxWindow_MakeModal, 1 },
-        { "wxWindow_Lower", _wrap_wxWindow_Lower, 1 },
-        { "wxWindow_LoadFromResource", _wrap_wxWindow_LoadFromResource, 1 },
-        { "wxWindow_Layout", _wrap_wxWindow_Layout, 1 },
-        { "wxWindow_IsShown", _wrap_wxWindow_IsShown, 1 },
-        { "wxWindow_IsRetained", _wrap_wxWindow_IsRetained, 1 },
-        { "wxWindow_IsEnabled", _wrap_wxWindow_IsEnabled, 1 },
-        { "wxWindow_InitDialog", _wrap_wxWindow_InitDialog, 1 },
-        { "wxWindow_GetWindowStyleFlag", _wrap_wxWindow_GetWindowStyleFlag, 1 },
-        { "wxWindow_GetTitle", _wrap_wxWindow_GetTitle, 1 },
-        { "wxWindow_GetTextExtent", _wrap_wxWindow_GetTextExtent, 1 },
-        { "wxWindow_GetSize", _wrap_wxWindow_GetSize, 1 },
-        { "wxWindow_GetScrollRange", _wrap_wxWindow_GetScrollRange, 1 },
-        { "wxWindow_GetScrollPos", _wrap_wxWindow_GetScrollPos, 1 },
-        { "wxWindow_GetScrollThumb", _wrap_wxWindow_GetScrollThumb, 1 },
-        { "wxWindow_GetReturnCode", _wrap_wxWindow_GetReturnCode, 1 },
-        { "wxWindow_GetParent", _wrap_wxWindow_GetParent, 1 },
-        { "wxWindow_GetName", _wrap_wxWindow_GetName, 1 },
-        { "wxWindow_GetLabel", _wrap_wxWindow_GetLabel, 1 },
-        { "wxWindow_GetPosition", _wrap_wxWindow_GetPosition, 1 },
-        { "wxWindow_GetId", _wrap_wxWindow_GetId, 1 },
-        { "wxWindow_GetGrandParent", _wrap_wxWindow_GetGrandParent, 1 },
-        { "wxWindow_GetForegroundColour", _wrap_wxWindow_GetForegroundColour, 1 },
-        { "wxWindow_GetFont", _wrap_wxWindow_GetFont, 1 },
-        { "wxWindow_GetDefaultItem", _wrap_wxWindow_GetDefaultItem, 1 },
-        { "wxWindow_GetConstraints", _wrap_wxWindow_GetConstraints, 1 },
-        { "wxWindow_GetClientSize", _wrap_wxWindow_GetClientSize, 1 },
-        { "wxWindow_GetCharWidth", _wrap_wxWindow_GetCharWidth, 1 },
-        { "wxWindow_GetCharHeight", _wrap_wxWindow_GetCharHeight, 1 },
-        { "wxWindow_GetBackgroundColour", _wrap_wxWindow_GetBackgroundColour, 1 },
-        { "wxWindow_Fit", _wrap_wxWindow_Fit, 1 },
-        { "wxWindow_FindWindowByName", _wrap_wxWindow_FindWindowByName, 1 },
-        { "wxWindow_FindWindowByID", _wrap_wxWindow_FindWindowByID, 1 },
-        { "wxWindow_Enable", _wrap_wxWindow_Enable, 1 },
-        { "wxWindow_DragAcceptFiles", _wrap_wxWindow_DragAcceptFiles, 1 },
-        { "wxWindow_DestroyChildren", _wrap_wxWindow_DestroyChildren, 1 },
-        { "wxWindow_Destroy", _wrap_wxWindow_Destroy, 1 },
-        { "wxWindow_Close", _wrap_wxWindow_Close, 1 },
-        { "wxWindow_ClientToScreen", _wrap_wxWindow_ClientToScreen, 1 },
-        { "wxWindow_Centre", _wrap_wxWindow_Centre, 1 },
-        { "wxWindow_Center", _wrap_wxWindow_Center, 1 },
-        { "wxWindow_CaptureMouse", _wrap_wxWindow_CaptureMouse, 1 },
-        { "new_wxWindow", _wrap_new_wxWindow, 1 },
-        { "wxEvtHandler_Connect", _wrap_wxEvtHandler_Connect, 1 },
-        { "wxWindow_FindFocus", _wrap_wxWindow_FindFocus, 1 },
+        { "wxMenuItem_DeleteSubMenu", (PyCFunction) _wrap_wxMenuItem_DeleteSubMenu, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_SetTextColour", (PyCFunction) _wrap_wxMenuItem_SetTextColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_SetMarginWidth", (PyCFunction) _wrap_wxMenuItem_SetMarginWidth, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_SetFont", (PyCFunction) _wrap_wxMenuItem_SetFont, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_SetBitmaps", (PyCFunction) _wrap_wxMenuItem_SetBitmaps, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_SetBackgroundColour", (PyCFunction) _wrap_wxMenuItem_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_GetTextColour", (PyCFunction) _wrap_wxMenuItem_GetTextColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_GetMarginWidth", (PyCFunction) _wrap_wxMenuItem_GetMarginWidth, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_GetFont", (PyCFunction) _wrap_wxMenuItem_GetFont, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_GetBitmap", (PyCFunction) _wrap_wxMenuItem_GetBitmap, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_GetBackgroundColour", (PyCFunction) _wrap_wxMenuItem_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_Check", (PyCFunction) _wrap_wxMenuItem_Check, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_Enable", (PyCFunction) _wrap_wxMenuItem_Enable, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_SetHelp", (PyCFunction) _wrap_wxMenuItem_SetHelp, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_GetHelp", (PyCFunction) _wrap_wxMenuItem_GetHelp, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_GetName", (PyCFunction) _wrap_wxMenuItem_GetName, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_SetName", (PyCFunction) _wrap_wxMenuItem_SetName, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_GetSubMenu", (PyCFunction) _wrap_wxMenuItem_GetSubMenu, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_GetId", (PyCFunction) _wrap_wxMenuItem_GetId, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_IsCheckable", (PyCFunction) _wrap_wxMenuItem_IsCheckable, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_IsChecked", (PyCFunction) _wrap_wxMenuItem_IsChecked, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_IsEnabled", (PyCFunction) _wrap_wxMenuItem_IsEnabled, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuItem_IsSeparator", (PyCFunction) _wrap_wxMenuItem_IsSeparator, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxMenuItem", (PyCFunction) _wrap_new_wxMenuItem, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_GetMenu", (PyCFunction) _wrap_wxMenuBar_GetMenu, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_GetMenuCount", (PyCFunction) _wrap_wxMenuBar_GetMenuCount, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_SetLabelTop", (PyCFunction) _wrap_wxMenuBar_SetLabelTop, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_GetLabelTop", (PyCFunction) _wrap_wxMenuBar_GetLabelTop, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_SetLabel", (PyCFunction) _wrap_wxMenuBar_SetLabel, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_SetHelpString", (PyCFunction) _wrap_wxMenuBar_SetHelpString, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_GetLabel", (PyCFunction) _wrap_wxMenuBar_GetLabel, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_GetHelpString", (PyCFunction) _wrap_wxMenuBar_GetHelpString, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_EnableTop", (PyCFunction) _wrap_wxMenuBar_EnableTop, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_FindItemForId", (PyCFunction) _wrap_wxMenuBar_FindItemForId, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_FindMenuItem", (PyCFunction) _wrap_wxMenuBar_FindMenuItem, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_Enabled", (PyCFunction) _wrap_wxMenuBar_Enabled, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_Enable", (PyCFunction) _wrap_wxMenuBar_Enable, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_Checked", (PyCFunction) _wrap_wxMenuBar_Checked, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_Check", (PyCFunction) _wrap_wxMenuBar_Check, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenuBar_Append", (PyCFunction) _wrap_wxMenuBar_Append, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxMenuBar", (PyCFunction) _wrap_new_wxMenuBar, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_Destroy", (PyCFunction) _wrap_wxMenu_Destroy, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_UpdateUI", (PyCFunction) _wrap_wxMenu_UpdateUI, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_SetLabel", (PyCFunction) _wrap_wxMenu_SetLabel, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_IsEnabled", (PyCFunction) _wrap_wxMenu_IsEnabled, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_IsChecked", (PyCFunction) _wrap_wxMenu_IsChecked, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_SetHelpString", (PyCFunction) _wrap_wxMenu_SetHelpString, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_GetLabel", (PyCFunction) _wrap_wxMenu_GetLabel, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_GetHelpString", (PyCFunction) _wrap_wxMenu_GetHelpString, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_FindItemForId", (PyCFunction) _wrap_wxMenu_FindItemForId, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_SetTitle", (PyCFunction) _wrap_wxMenu_SetTitle, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_GetTitle", (PyCFunction) _wrap_wxMenu_GetTitle, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_FindItem", (PyCFunction) _wrap_wxMenu_FindItem, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_Enable", (PyCFunction) _wrap_wxMenu_Enable, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_Check", (PyCFunction) _wrap_wxMenu_Check, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_Break", (PyCFunction) _wrap_wxMenu_Break, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_AppendSeparator", (PyCFunction) _wrap_wxMenu_AppendSeparator, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_AppendItem", (PyCFunction) _wrap_wxMenu_AppendItem, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_AppendMenu", (PyCFunction) _wrap_wxMenu_AppendMenu, METH_VARARGS | METH_KEYWORDS },
+        { "wxMenu_Append", (PyCFunction) _wrap_wxMenu_Append, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxMenu", (PyCFunction) _wrap_new_wxMenu, METH_VARARGS | METH_KEYWORDS },
+        { "wxScrolledWindow_ViewStart", (PyCFunction) _wrap_wxScrolledWindow_ViewStart, METH_VARARGS | METH_KEYWORDS },
+        { "wxScrolledWindow_SetScrollbars", (PyCFunction) _wrap_wxScrolledWindow_SetScrollbars, METH_VARARGS | METH_KEYWORDS },
+        { "wxScrolledWindow_Scroll", (PyCFunction) _wrap_wxScrolledWindow_Scroll, METH_VARARGS | METH_KEYWORDS },
+        { "wxScrolledWindow_PrepareDC", (PyCFunction) _wrap_wxScrolledWindow_PrepareDC, METH_VARARGS | METH_KEYWORDS },
+        { "wxScrolledWindow_IsRetained", (PyCFunction) _wrap_wxScrolledWindow_IsRetained, METH_VARARGS | METH_KEYWORDS },
+        { "wxScrolledWindow_GetVirtualSize", (PyCFunction) _wrap_wxScrolledWindow_GetVirtualSize, METH_VARARGS | METH_KEYWORDS },
+        { "wxScrolledWindow_GetScrollPixelsPerUnit", (PyCFunction) _wrap_wxScrolledWindow_GetScrollPixelsPerUnit, METH_VARARGS | METH_KEYWORDS },
+        { "wxScrolledWindow_EnableScrolling", (PyCFunction) _wrap_wxScrolledWindow_EnableScrolling, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxScrolledWindow", (PyCFunction) _wrap_new_wxScrolledWindow, METH_VARARGS | METH_KEYWORDS },
+        { "wxDialog_SetReturnCode", (PyCFunction) _wrap_wxDialog_SetReturnCode, METH_VARARGS | METH_KEYWORDS },
+        { "wxDialog_GetReturnCode", (PyCFunction) _wrap_wxDialog_GetReturnCode, METH_VARARGS | METH_KEYWORDS },
+        { "wxDialog_ShowModal", (PyCFunction) _wrap_wxDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+        { "wxDialog_Show", (PyCFunction) _wrap_wxDialog_Show, METH_VARARGS | METH_KEYWORDS },
+        { "wxDialog_SetTitle", (PyCFunction) _wrap_wxDialog_SetTitle, METH_VARARGS | METH_KEYWORDS },
+        { "wxDialog_IsModal", (PyCFunction) _wrap_wxDialog_IsModal, METH_VARARGS | METH_KEYWORDS },
+        { "wxDialog_SetModal", (PyCFunction) _wrap_wxDialog_SetModal, METH_VARARGS | METH_KEYWORDS },
+        { "wxDialog_IsIconized", (PyCFunction) _wrap_wxDialog_IsIconized, METH_VARARGS | METH_KEYWORDS },
+        { "wxDialog_Iconize", (PyCFunction) _wrap_wxDialog_Iconize, METH_VARARGS | METH_KEYWORDS },
+        { "wxDialog_GetTitle", (PyCFunction) _wrap_wxDialog_GetTitle, METH_VARARGS | METH_KEYWORDS },
+        { "wxDialog_EndModal", (PyCFunction) _wrap_wxDialog_EndModal, METH_VARARGS | METH_KEYWORDS },
+        { "wxDialog_Centre", (PyCFunction) _wrap_wxDialog_Centre, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxDialog", (PyCFunction) _wrap_new_wxDialog, METH_VARARGS | METH_KEYWORDS },
+        { "wxPanel_SetDefaultItem", (PyCFunction) _wrap_wxPanel_SetDefaultItem, METH_VARARGS | METH_KEYWORDS },
+        { "wxPanel_GetDefaultItem", (PyCFunction) _wrap_wxPanel_GetDefaultItem, METH_VARARGS | METH_KEYWORDS },
+        { "wxPanel_InitDialog", (PyCFunction) _wrap_wxPanel_InitDialog, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxPanel", (PyCFunction) _wrap_new_wxPanel, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetToolTip", (PyCFunction) _wrap_wxWindow_GetToolTip, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetToolTip", (PyCFunction) _wrap_wxWindow_SetToolTip, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetToolTipString", (PyCFunction) _wrap_wxWindow_SetToolTipString, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_ConvertPixelSizeToDialog", (PyCFunction) _wrap_wxWindow_ConvertPixelSizeToDialog, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_ConvertPixelPointToDialog", (PyCFunction) _wrap_wxWindow_ConvertPixelPointToDialog, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_DLG_SZE", (PyCFunction) _wrap_wxWindow_ConvertDialogSizeToPixels, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_DLG_PNT", (PyCFunction) _wrap_wxWindow_ConvertDialogPointToPixels, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_ConvertDialogSizeToPixels", (PyCFunction) _wrap_wxWindow_ConvertDialogSizeToPixels, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_ConvertDialogPointToPixels", (PyCFunction) _wrap_wxWindow_ConvertDialogPointToPixels, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_WarpPointer", (PyCFunction) _wrap_wxWindow_WarpPointer, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Validate", (PyCFunction) _wrap_wxWindow_Validate, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_TransferDataToWindow", (PyCFunction) _wrap_wxWindow_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_TransferDataFromWindow", (PyCFunction) _wrap_wxWindow_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Show", (PyCFunction) _wrap_wxWindow_Show, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetTitle", (PyCFunction) _wrap_wxWindow_SetTitle, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetEventHandler", (PyCFunction) _wrap_wxWindow_SetEventHandler, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetCursor", (PyCFunction) _wrap_wxWindow_SetCursor, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetClientSize", (PyCFunction) _wrap_wxWindow_SetClientSize, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetClientSizeWH", (PyCFunction) _wrap_wxWindow_SetClientSizeWH, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetSizeHints", (PyCFunction) _wrap_wxWindow_SetSizeHints, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetPosition", (PyCFunction) _wrap_wxWindow_SetPosition, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetSize", (PyCFunction) _wrap_wxWindow_SetSize, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetDimensions", (PyCFunction) _wrap_wxWindow_SetDimensions, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetScrollPos", (PyCFunction) _wrap_wxWindow_SetScrollPos, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetScrollbar", (PyCFunction) _wrap_wxWindow_SetScrollbar, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetName", (PyCFunction) _wrap_wxWindow_SetName, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetId", (PyCFunction) _wrap_wxWindow_SetId, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetForegroundColour", (PyCFunction) _wrap_wxWindow_SetForegroundColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetFont", (PyCFunction) _wrap_wxWindow_SetFont, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetFocus", (PyCFunction) _wrap_wxWindow_SetFocus, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetConstraints", (PyCFunction) _wrap_wxWindow_SetConstraints, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetBackgroundColour", (PyCFunction) _wrap_wxWindow_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetAutoLayout", (PyCFunction) _wrap_wxWindow_SetAutoLayout, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetAcceleratorTable", (PyCFunction) _wrap_wxWindow_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_ScrollWindow", (PyCFunction) _wrap_wxWindow_ScrollWindow, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_ScreenToClient", (PyCFunction) _wrap_wxWindow_ScreenToClient, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_ScreenToClientXY", (PyCFunction) _wrap_wxWindow_ScreenToClientXY, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Reparent", (PyCFunction) _wrap_wxWindow_Reparent, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_ReleaseMouse", (PyCFunction) _wrap_wxWindow_ReleaseMouse, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Refresh", (PyCFunction) _wrap_wxWindow_Refresh, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Raise", (PyCFunction) _wrap_wxWindow_Raise, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_PopupMenu", (PyCFunction) _wrap_wxWindow_PopupMenu, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_PopupMenuXY", (PyCFunction) _wrap_wxWindow_PopupMenuXY, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_PushEventHandler", (PyCFunction) _wrap_wxWindow_PushEventHandler, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_PopEventHandler", (PyCFunction) _wrap_wxWindow_PopEventHandler, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Move", (PyCFunction) _wrap_wxWindow_Move, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_MoveXY", (PyCFunction) _wrap_wxWindow_MoveXY, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_MakeModal", (PyCFunction) _wrap_wxWindow_MakeModal, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Lower", (PyCFunction) _wrap_wxWindow_Lower, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_LoadFromResource", (PyCFunction) _wrap_wxWindow_LoadFromResource, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Layout", (PyCFunction) _wrap_wxWindow_Layout, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_IsTopLevel", (PyCFunction) _wrap_wxWindow_IsTopLevel, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_IsShown", (PyCFunction) _wrap_wxWindow_IsShown, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_IsRetained", (PyCFunction) _wrap_wxWindow_IsRetained, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_IsEnabled", (PyCFunction) _wrap_wxWindow_IsEnabled, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_InitDialog", (PyCFunction) _wrap_wxWindow_InitDialog, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Hide", (PyCFunction) _wrap_wxWindow_Hide, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetWindowStyleFlag", (PyCFunction) _wrap_wxWindow_GetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetUpdateRegion", (PyCFunction) _wrap_wxWindow_GetUpdateRegion, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetTitle", (PyCFunction) _wrap_wxWindow_GetTitle, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetFullTextExtent", (PyCFunction) _wrap_wxWindow_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetTextExtent", (PyCFunction) _wrap_wxWindow_GetTextExtent, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetSize", (PyCFunction) _wrap_wxWindow_GetSize, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetSizeTuple", (PyCFunction) _wrap_wxWindow_GetSizeTuple, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetScrollRange", (PyCFunction) _wrap_wxWindow_GetScrollRange, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetScrollPos", (PyCFunction) _wrap_wxWindow_GetScrollPos, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetScrollThumb", (PyCFunction) _wrap_wxWindow_GetScrollThumb, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetRect", (PyCFunction) _wrap_wxWindow_GetRect, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetPosition", (PyCFunction) _wrap_wxWindow_GetPosition, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetPositionTuple", (PyCFunction) _wrap_wxWindow_GetPositionTuple, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetParent", (PyCFunction) _wrap_wxWindow_GetParent, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetName", (PyCFunction) _wrap_wxWindow_GetName, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_SetLabel", (PyCFunction) _wrap_wxWindow_SetLabel, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetLabel", (PyCFunction) _wrap_wxWindow_GetLabel, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetId", (PyCFunction) _wrap_wxWindow_GetId, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetGrandParent", (PyCFunction) _wrap_wxWindow_GetGrandParent, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetForegroundColour", (PyCFunction) _wrap_wxWindow_GetForegroundColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetFont", (PyCFunction) _wrap_wxWindow_GetFont, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetEventHandler", (PyCFunction) _wrap_wxWindow_GetEventHandler, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetConstraints", (PyCFunction) _wrap_wxWindow_GetConstraints, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetClientSize", (PyCFunction) _wrap_wxWindow_GetClientSize, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetClientSizeTuple", (PyCFunction) _wrap_wxWindow_GetClientSizeTuple, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetCharWidth", (PyCFunction) _wrap_wxWindow_GetCharWidth, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetCharHeight", (PyCFunction) _wrap_wxWindow_GetCharHeight, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_GetBackgroundColour", (PyCFunction) _wrap_wxWindow_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Fit", (PyCFunction) _wrap_wxWindow_Fit, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_FindWindowByName", (PyCFunction) _wrap_wxWindow_FindWindowByName, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_FindWindowById", (PyCFunction) _wrap_wxWindow_FindWindowById, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Enable", (PyCFunction) _wrap_wxWindow_Enable, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_DragAcceptFiles", (PyCFunction) _wrap_wxWindow_DragAcceptFiles, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_DestroyChildren", (PyCFunction) _wrap_wxWindow_DestroyChildren, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Destroy", (PyCFunction) _wrap_wxWindow_Destroy, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Close", (PyCFunction) _wrap_wxWindow_Close, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_ClientToScreen", (PyCFunction) _wrap_wxWindow_ClientToScreen, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_ClientToScreenXY", (PyCFunction) _wrap_wxWindow_ClientToScreenXY, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_CenterOnParent", (PyCFunction) _wrap_wxWindow_CenterOnParent, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_CentreOnParent", (PyCFunction) _wrap_wxWindow_CentreOnParent, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Centre", (PyCFunction) _wrap_wxWindow_Centre, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_Center", (PyCFunction) _wrap_wxWindow_Center, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_CaptureMouse", (PyCFunction) _wrap_wxWindow_CaptureMouse, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxWindow", (PyCFunction) _wrap_new_wxWindow, METH_VARARGS | METH_KEYWORDS },
+        { "wxEvtHandler_Connect", (PyCFunction) _wrap_wxEvtHandler_Connect, METH_VARARGS | METH_KEYWORDS },
+        { "wxEvtHandler_ProcessEvent", (PyCFunction) _wrap_wxEvtHandler_ProcessEvent, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_FromHWND", (PyCFunction) _wrap_wxWindow_FromHWND, METH_VARARGS | METH_KEYWORDS },
+        { "wxWindow_FindFocus", (PyCFunction) _wrap_wxWindow_FindFocus, METH_VARARGS | METH_KEYWORDS },

         { NULL, NULL }
 };
         { NULL, NULL }
 };

+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_signed_long","_long",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxDialog",SwigwxDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxPanel",SwigwxPanelTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxWindow",SwigwxWindowTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_byte","_unsigned_char",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_wxPanel","_class_wxScrolledWindow",SwigwxScrolledWindowTowxPanel},
+    { "_wxPanel","_wxScrolledWindow",SwigwxScrolledWindowTowxPanel},
+    { "_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel},
+    { "_wxPanel","_wxDialog",SwigwxDialogTowxPanel},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_class_wxScrolledWindow",SwigwxScrolledWindowTowxPanel},
+    { "_class_wxPanel","_wxScrolledWindow",SwigwxScrolledWindowTowxPanel},
+    { "_class_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel},
+    { "_class_wxPanel","_wxDialog",SwigwxDialogTowxPanel},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_class_wxScrolledWindow",SwigwxScrolledWindowTowxWindow},
+    { "_class_wxWindow","_wxScrolledWindow",SwigwxScrolledWindowTowxWindow},
+    { "_class_wxWindow","_class_wxDialog",SwigwxDialogTowxWindow},
+    { "_class_wxWindow","_wxDialog",SwigwxDialogTowxWindow},
+    { "_class_wxWindow","_class_wxPanel",SwigwxPanelTowxWindow},
+    { "_class_wxWindow","_wxPanel",SwigwxPanelTowxWindow},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler},
+    { "_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler},
+    { "_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler},
+    { "_wxEvtHandler","_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxDialog",SwigwxDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxPanel",SwigwxPanelTowxEvtHandler},
+    { "_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler},
+    { "_wxEvtHandler","_wxWindow",SwigwxWindowTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_wxWindow","_class_wxScrolledWindow",SwigwxScrolledWindowTowxWindow},
+    { "_wxWindow","_wxScrolledWindow",SwigwxScrolledWindowTowxWindow},
+    { "_wxWindow","_class_wxDialog",SwigwxDialogTowxWindow},
+    { "_wxWindow","_wxDialog",SwigwxDialogTowxWindow},
+    { "_wxWindow","_class_wxPanel",SwigwxPanelTowxWindow},
+    { "_wxWindow","_wxPanel",SwigwxPanelTowxWindow},
+    { "_wxWindow","_class_wxWindow",0},
+{0,0,0}};
+

 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif

-SWIGEXPORT(void,initwindowsc)() {
+SWIGEXPORT(void) initwindowsc() {

         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("windowsc", windowscMethods);
         d = PyModule_GetDict(m);
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("windowsc", windowscMethods);
         d = PyModule_GetDict(m);

-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPyMenu",SwigwxPyMenuTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxPyMenu",SwigwxPyMenuTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxDialog",SwigwxDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPanel",SwigwxPanelTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxWindow",SwigwxWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-        SWIG_RegisterMapping("_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_wxDialog",SwigwxDialogTowxPanel);
-        SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxDialog",SwigwxDialogTowxPanel);
-        SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-        SWIG_RegisterMapping("_signed_int","_EBool",0);
-        SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_signed_int","_int",0);
-        SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_wxMenu","_class_wxPyMenu",SwigwxPyMenuTowxMenu);
-        SWIG_RegisterMapping("_wxMenu","_wxPyMenu",SwigwxPyMenuTowxMenu);
-        SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-        SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxScrolledWindow",SwigwxScrolledWindowTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxScrolledWindow",SwigwxScrolledWindowTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxDialog",SwigwxDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxDialog",SwigwxDialogTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_class_wxPanel",SwigwxPanelTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxPanel",SwigwxPanelTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-        SWIG_RegisterMapping("_class_wxMenu","_class_wxPyMenu",SwigwxPyMenuTowxMenu);
-        SWIG_RegisterMapping("_class_wxMenu","_wxPyMenu",SwigwxPyMenuTowxMenu);
-        SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-        SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxPyMenu",SwigwxPyMenuTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxPyMenu",SwigwxPyMenuTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxDialog",SwigwxDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxPanel",SwigwxPanelTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxWindow",SwigwxWindowTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-        SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-        SWIG_RegisterMapping("_wxWindow","_class_wxScrolledWindow",SwigwxScrolledWindowTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxScrolledWindow",SwigwxScrolledWindowTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxDialog",SwigwxDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxDialog",SwigwxDialogTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxPanel",SwigwxPanelTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxPanel",SwigwxPanelTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}

 }
 }