X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d99702e4b41ed8b4110325e3dd9d710b5d32562..d554e5da38a90760e92b7b0e4a66dbaef71a2d54:/utils/wxPython/src/msw/controls.cpp

diff --git a/utils/wxPython/src/msw/controls.cpp b/utils/wxPython/src/msw/controls.cpp
index f75b98b5e2..0c37b6dda6 100644
--- a/utils/wxPython/src/msw/controls.cpp
+++ b/utils/wxPython/src/msw/controls.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 810)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -117,23 +117,27 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     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);
-
-
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 wxValidator wxPyDefaultValidator;       // Non-const default because of SWIG
 #ifdef __cplusplus
 extern "C" {
 #endif
+static int _wrap_wxDefaultValidator_set(PyObject *val) {
+
+    PyErr_SetString(PyExc_TypeError,"Variable wxDefaultValidator is read-only.");
+    return 1;
+}
+
+static PyObject *_wrap_wxDefaultValidator_get() {
+    PyObject * pyobj;
+    char ptemp[128];
+
+    SWIG_MakePtr(ptemp,(char *) &wxDefaultValidator,"_wxValidator_p");
+    pyobj = PyString_FromString(ptemp);
+    return pyobj;
+}
+
 static void *SwigwxControlTowxWindow(void *ptr) {
     wxControl *src;
     wxWindow *dest;
@@ -151,15 +155,16 @@ static void *SwigwxControlTowxEvtHandler(void *ptr) {
 }
 
 #define wxControl_Command(_swigobj,_swigarg0)  (_swigobj->Command(_swigarg0))
-static PyObject *_wrap_wxControl_Command(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxControl_Command(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxControl * _arg0;
     wxCommandEvent * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","event", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxControl_Command",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxControl_Command",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -186,14 +191,15 @@ static PyObject *_wrap_wxControl_Command(PyObject *self, PyObject *args) {
 }
 
 #define wxControl_GetLabel(_swigobj)  (_swigobj->GetLabel())
-static PyObject *_wrap_wxControl_GetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxControl_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxControl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxControl_GetLabel",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxControl_GetLabel",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -217,15 +223,16 @@ static PyObject *_wrap_wxControl_GetLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxControl_SetLabel(_swigobj,_swigarg0)  (_swigobj->SetLabel(_swigarg0))
-static PyObject *_wrap_wxControl_SetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxControl_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxControl * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","label", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxControl_SetLabel",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxControl_SetLabel",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -280,7 +287,7 @@ static void *SwigwxButtonTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
-static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxButton * _result;
     wxWindow * _arg0;
@@ -293,13 +300,16 @@ static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args) {
     char * _arg7 = (char *) "button";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
-    PyObject * _argo3 = 0;
-    PyObject * _argo4 = 0;
+    wxPoint  temp;
+    PyObject * _obj3 = 0;
+    wxSize  temp0;
+    PyObject * _obj4 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","id","label","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOlOs:new_wxButton",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxButton",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_argo6,&_arg7)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -315,20 +325,18 @@ static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
-    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_wxButton. Expected _wxPoint_p.");
+    if (_obj3)
+{
+    _arg3 = &temp;
+    if (! wxPoint_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
-    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_wxButton. Expected _wxSize_p.");
+}
+    if (_obj4)
+{
+    _arg4 = &temp0;
+    if (! wxSize_helper(_obj4, &_arg4))
         return NULL;
-        }
-    }
+}
     if (_argo6) {
         if (_argo6 == Py_None) { _arg6 = NULL; }
         else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) {
@@ -356,13 +364,14 @@ static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args) {
 }
 
 #define wxButton_SetDefault(_swigobj)  (_swigobj->SetDefault())
-static PyObject *_wrap_wxButton_SetDefault(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxButton_SetDefault(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxButton_SetDefault",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxButton_SetDefault",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -414,7 +423,7 @@ static void *SwigwxBitmapButtonTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxBitmapButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxBitmapButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
-static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmapButton * _result;
     wxWindow * _arg0;
@@ -427,13 +436,16 @@ static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args) {
     char * _arg7 = (char *) "button";
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
-    PyObject * _argo3 = 0;
-    PyObject * _argo4 = 0;
+    wxPoint  temp;
+    PyObject * _obj3 = 0;
+    wxSize  temp0;
+    PyObject * _obj4 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","id","bitmap","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOlOs:new_wxBitmapButton",&_argo0,&_arg1,&_argo2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxBitmapButton",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&_obj4,&_arg5,&_argo6,&_arg7)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -449,20 +461,18 @@ static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    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_wxBitmapButton. Expected _wxPoint_p.");
+    if (_obj3)
+{
+    _arg3 = &temp;
+    if (! wxPoint_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
-    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_wxBitmapButton. Expected _wxSize_p.");
+}
+    if (_obj4)
+{
+    _arg4 = &temp0;
+    if (! wxSize_helper(_obj4, &_arg4))
         return NULL;
-        }
-    }
+}
     if (_argo6) {
         if (_argo6 == Py_None) { _arg6 = NULL; }
         else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) {
@@ -486,15 +496,16 @@ static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args) {
 }
 
 #define wxBitmapButton_GetBitmapLabel(_swigobj)  (_swigobj->GetBitmapLabel())
-static PyObject *_wrap_wxBitmapButton_GetBitmapLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_GetBitmapLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxBitmapButton_GetBitmapLabel",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmapButton_GetBitmapLabel",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -520,15 +531,16 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapLabel(PyObject *self, PyObject *a
 }
 
 #define wxBitmapButton_GetBitmapDisabled(_swigobj)  (_swigobj->GetBitmapDisabled())
-static PyObject *_wrap_wxBitmapButton_GetBitmapDisabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_GetBitmapDisabled(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxBitmapButton_GetBitmapDisabled",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmapButton_GetBitmapDisabled",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -554,15 +566,16 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapDisabled(PyObject *self, PyObject
 }
 
 #define wxBitmapButton_GetBitmapFocus(_swigobj)  (_swigobj->GetBitmapFocus())
-static PyObject *_wrap_wxBitmapButton_GetBitmapFocus(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_GetBitmapFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxBitmapButton_GetBitmapFocus",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmapButton_GetBitmapFocus",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -588,15 +601,16 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapFocus(PyObject *self, PyObject *a
 }
 
 #define wxBitmapButton_GetBitmapSelected(_swigobj)  (_swigobj->GetBitmapSelected())
-static PyObject *_wrap_wxBitmapButton_GetBitmapSelected(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_GetBitmapSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxBitmapButton_GetBitmapSelected",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmapButton_GetBitmapSelected",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -622,15 +636,16 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapSelected(PyObject *self, PyObject
 }
 
 #define wxBitmapButton_SetBitmapDisabled(_swigobj,_swigarg0)  (_swigobj->SetBitmapDisabled(_swigarg0))
-static PyObject *_wrap_wxBitmapButton_SetBitmapDisabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_SetBitmapDisabled(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","bitmap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxBitmapButton_SetBitmapDisabled",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBitmapButton_SetBitmapDisabled",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -657,15 +672,16 @@ static PyObject *_wrap_wxBitmapButton_SetBitmapDisabled(PyObject *self, PyObject
 }
 
 #define wxBitmapButton_SetBitmapFocus(_swigobj,_swigarg0)  (_swigobj->SetBitmapFocus(_swigarg0))
-static PyObject *_wrap_wxBitmapButton_SetBitmapFocus(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_SetBitmapFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","bitmap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxBitmapButton_SetBitmapFocus",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBitmapButton_SetBitmapFocus",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -692,15 +708,16 @@ static PyObject *_wrap_wxBitmapButton_SetBitmapFocus(PyObject *self, PyObject *a
 }
 
 #define wxBitmapButton_SetBitmapSelected(_swigobj,_swigarg0)  (_swigobj->SetBitmapSelected(_swigarg0))
-static PyObject *_wrap_wxBitmapButton_SetBitmapSelected(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_SetBitmapSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","bitmap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxBitmapButton_SetBitmapSelected",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBitmapButton_SetBitmapSelected",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -727,15 +744,16 @@ static PyObject *_wrap_wxBitmapButton_SetBitmapSelected(PyObject *self, PyObject
 }
 
 #define wxBitmapButton_SetBitmapLabel(_swigobj,_swigarg0)  (_swigobj->SetBitmapLabel(_swigarg0))
-static PyObject *_wrap_wxBitmapButton_SetBitmapLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_SetBitmapLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","bitmap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxBitmapButton_SetBitmapLabel",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBitmapButton_SetBitmapLabel",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -786,7 +804,7 @@ static void *SwigwxCheckBoxTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxCheckBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxCheckBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
-static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCheckBox * _result;
     wxWindow * _arg0;
@@ -799,13 +817,16 @@ static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args) {
     char * _arg7 = (char *) "checkBox";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
-    PyObject * _argo3 = 0;
-    PyObject * _argo4 = 0;
+    wxPoint  temp;
+    PyObject * _obj3 = 0;
+    wxSize  temp0;
+    PyObject * _obj4 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","id","label","pos","size","style","val","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOlOs:new_wxCheckBox",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxCheckBox",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_argo6,&_arg7)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -821,20 +842,18 @@ static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
-    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_wxCheckBox. Expected _wxPoint_p.");
+    if (_obj3)
+{
+    _arg3 = &temp;
+    if (! wxPoint_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
-    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_wxCheckBox. Expected _wxSize_p.");
+}
+    if (_obj4)
+{
+    _arg4 = &temp0;
+    if (! wxSize_helper(_obj4, &_arg4))
         return NULL;
-        }
-    }
+}
     if (_argo6) {
         if (_argo6 == Py_None) { _arg6 = NULL; }
         else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) {
@@ -862,14 +881,15 @@ static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args) {
 }
 
 #define wxCheckBox_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxCheckBox_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCheckBox_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxCheckBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCheckBox_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCheckBox_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -888,15 +908,16 @@ static PyObject *_wrap_wxCheckBox_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxCheckBox_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxCheckBox_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCheckBox_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCheckBox * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","state", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxCheckBox_SetValue",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxCheckBox_SetValue",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -941,7 +962,7 @@ static void *SwigwxChoiceTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxChoice(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8) (new wxChoice(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8))
-static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxChoice * _result;
     wxWindow * _arg0;
@@ -954,14 +975,17 @@ static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args) {
     wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator;
     char * _arg8 = (char *) "choice";
     PyObject * _argo0 = 0;
-    PyObject * _argo2 = 0;
-    PyObject * _argo3 = 0;
+    wxPoint  temp;
+    PyObject * _obj2 = 0;
+    wxSize  temp0;
+    PyObject * _obj3 = 0;
     PyObject * _obj5 = 0;
     PyObject * _argo7 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","LIST","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOOlOs:new_wxChoice",&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOOlOs:new_wxChoice",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj5,&_arg6,&_argo7,&_arg8)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -970,20 +994,18 @@ static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args) {
         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 new_wxChoice. Expected _wxPoint_p.");
+    if (_obj2)
+{
+    _arg2 = &temp;
+    if (! wxPoint_helper(_obj2, &_arg2))
         return NULL;
-        }
-    }
-    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_wxChoice. Expected _wxSize_p.");
+}
+    if (_obj3)
+{
+    _arg3 = &temp0;
+    if (! wxSize_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
+}
     if (_obj5)
 {
     _arg5 = wxString_LIST_helper(_obj5);
@@ -1025,15 +1047,16 @@ static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_Append(_swigobj,_swigarg0)  (_swigobj->Append(_swigarg0))
-static PyObject *_wrap_wxChoice_Append(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_Append(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxChoice * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxChoice_Append",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxChoice_Append",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1064,13 +1087,14 @@ static PyObject *_wrap_wxChoice_Append(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_Clear(_swigobj)  (_swigobj->Clear())
-static PyObject *_wrap_wxChoice_Clear(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxChoice * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxChoice_Clear",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxChoice_Clear",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1090,16 +1114,17 @@ static PyObject *_wrap_wxChoice_Clear(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_FindString(_swigobj,_swigarg0)  (_swigobj->FindString(_swigarg0))
-static PyObject *_wrap_wxChoice_FindString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_FindString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxChoice_FindString",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxChoice_FindString",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1129,14 +1154,15 @@ static PyObject *_wrap_wxChoice_FindString(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_GetColumns(_swigobj)  (_swigobj->GetColumns())
-static PyObject *_wrap_wxChoice_GetColumns(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_GetColumns(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxChoice_GetColumns",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxChoice_GetColumns",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1155,14 +1181,15 @@ static PyObject *_wrap_wxChoice_GetColumns(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxChoice_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxChoice_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxChoice_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1181,15 +1208,16 @@ static PyObject *_wrap_wxChoice_GetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_GetString(_swigobj,_swigarg0)  (_swigobj->GetString(_swigarg0))
-static PyObject *_wrap_wxChoice_GetString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxChoice * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxChoice_GetString",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxChoice_GetString",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1213,14 +1241,15 @@ static PyObject *_wrap_wxChoice_GetString(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_GetStringSelection(_swigobj)  (_swigobj->GetStringSelection())
-static PyObject *_wrap_wxChoice_GetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxChoice * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxChoice_GetStringSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxChoice_GetStringSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1244,14 +1273,15 @@ static PyObject *_wrap_wxChoice_GetStringSelection(PyObject *self, PyObject *arg
 }
 
 #define wxChoice_Number(_swigobj)  (_swigobj->Number())
-static PyObject *_wrap_wxChoice_Number(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_Number(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxChoice_Number",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxChoice_Number",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1270,14 +1300,15 @@ static PyObject *_wrap_wxChoice_Number(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_SetColumns(_swigobj,_swigarg0)  (_swigobj->SetColumns(_swigarg0))
-static PyObject *_wrap_wxChoice_SetColumns(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_SetColumns(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxChoice * _arg0;
     int  _arg1 = (int ) 1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxChoice_SetColumns",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxChoice_SetColumns",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1297,14 +1328,15 @@ static PyObject *_wrap_wxChoice_SetColumns(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
-static PyObject *_wrap_wxChoice_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxChoice * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxChoice_SetSelection",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxChoice_SetSelection",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1324,15 +1356,16 @@ static PyObject *_wrap_wxChoice_SetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_SetStringSelection(_swigobj,_swigarg0)  (_swigobj->SetStringSelection(_swigarg0))
-static PyObject *_wrap_wxChoice_SetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_SetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxChoice * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxChoice_SetStringSelection",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxChoice_SetStringSelection",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1395,7 +1428,7 @@ static void *SwigwxComboBoxTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxComboBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9) (new wxComboBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9))
-static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _result;
     wxWindow * _arg0;
@@ -1409,14 +1442,17 @@ static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args) {
     wxValidator * _arg8 = (wxValidator *) &wxPyDefaultValidator;
     char * _arg9 = (char *) "comboBox";
     PyObject * _argo0 = 0;
-    PyObject * _argo3 = 0;
-    PyObject * _argo4 = 0;
+    wxPoint  temp;
+    PyObject * _obj3 = 0;
+    wxSize  temp0;
+    PyObject * _obj4 = 0;
     PyObject * _obj6 = 0;
     PyObject * _argo8 = 0;
+    char *_kwnames[] = { "parent","id","value","pos","size","LIST","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|sOOOlOs:new_wxComboBox",&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_obj6,&_arg7,&_argo8,&_arg9)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|sOOOlOs:new_wxComboBox",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3,&_obj4,&_obj6,&_arg7,&_argo8,&_arg9)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1425,20 +1461,18 @@ static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    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_wxComboBox. Expected _wxPoint_p.");
+    if (_obj3)
+{
+    _arg3 = &temp;
+    if (! wxPoint_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
-    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_wxComboBox. Expected _wxSize_p.");
+}
+    if (_obj4)
+{
+    _arg4 = &temp0;
+    if (! wxSize_helper(_obj4, &_arg4))
         return NULL;
-        }
-    }
+}
     if (_obj6)
 {
     _arg6 = wxString_LIST_helper(_obj6);
@@ -1480,15 +1514,16 @@ static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Append(_swigobj,_swigarg0)  (_swigobj->Append(_swigarg0))
-static PyObject *_wrap_wxComboBox_Append(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Append(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxComboBox_Append",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxComboBox_Append",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1519,13 +1554,14 @@ static PyObject *_wrap_wxComboBox_Append(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Clear(_swigobj)  (_swigobj->Clear())
-static PyObject *_wrap_wxComboBox_Clear(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_Clear",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_Clear",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1545,13 +1581,14 @@ static PyObject *_wrap_wxComboBox_Clear(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Copy(_swigobj)  (_swigobj->Copy())
-static PyObject *_wrap_wxComboBox_Copy(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_Copy",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_Copy",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1571,13 +1608,14 @@ static PyObject *_wrap_wxComboBox_Copy(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Cut(_swigobj)  (_swigobj->Cut())
-static PyObject *_wrap_wxComboBox_Cut(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Cut(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_Cut",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_Cut",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1597,14 +1635,15 @@ static PyObject *_wrap_wxComboBox_Cut(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Delete(_swigobj,_swigarg0)  (_swigobj->Delete(_swigarg0))
-static PyObject *_wrap_wxComboBox_Delete(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Delete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxComboBox_Delete",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxComboBox_Delete",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1624,16 +1663,17 @@ static PyObject *_wrap_wxComboBox_Delete(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_FindString(_swigobj,_swigarg0)  (_swigobj->FindString(_swigarg0))
-static PyObject *_wrap_wxComboBox_FindString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_FindString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxComboBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxComboBox_FindString",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxComboBox_FindString",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1663,14 +1703,15 @@ static PyObject *_wrap_wxComboBox_FindString(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_GetInsertionPoint(_swigobj)  (_swigobj->GetInsertionPoint())
-static PyObject *_wrap_wxComboBox_GetInsertionPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_GetInsertionPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetInsertionPoint",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_GetInsertionPoint",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1689,14 +1730,15 @@ static PyObject *_wrap_wxComboBox_GetInsertionPoint(PyObject *self, PyObject *ar
 }
 
 #define wxComboBox_GetLastPosition(_swigobj)  (_swigobj->GetLastPosition())
-static PyObject *_wrap_wxComboBox_GetLastPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_GetLastPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetLastPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_GetLastPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1715,14 +1757,15 @@ static PyObject *_wrap_wxComboBox_GetLastPosition(PyObject *self, PyObject *args
 }
 
 #define wxComboBox_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxComboBox_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1741,15 +1784,16 @@ static PyObject *_wrap_wxComboBox_GetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_GetString(_swigobj,_swigarg0)  (_swigobj->GetString(_swigarg0))
-static PyObject *_wrap_wxComboBox_GetString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxComboBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxComboBox_GetString",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxComboBox_GetString",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1773,14 +1817,15 @@ static PyObject *_wrap_wxComboBox_GetString(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_GetStringSelection(_swigobj)  (_swigobj->GetStringSelection())
-static PyObject *_wrap_wxComboBox_GetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetStringSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_GetStringSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1804,14 +1849,15 @@ static PyObject *_wrap_wxComboBox_GetStringSelection(PyObject *self, PyObject *a
 }
 
 #define wxComboBox_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxComboBox_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1835,14 +1881,15 @@ static PyObject *_wrap_wxComboBox_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Number(_swigobj)  (_swigobj->Number())
-static PyObject *_wrap_wxComboBox_Number(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Number(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_Number",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_Number",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1861,13 +1908,14 @@ static PyObject *_wrap_wxComboBox_Number(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Paste(_swigobj)  (_swigobj->Paste())
-static PyObject *_wrap_wxComboBox_Paste(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Paste(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_Paste",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_Paste",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1887,7 +1935,7 @@ static PyObject *_wrap_wxComboBox_Paste(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Replace(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->Replace(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxComboBox_Replace(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Replace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     long  _arg1;
@@ -1895,9 +1943,10 @@ static PyObject *_wrap_wxComboBox_Replace(PyObject *self, PyObject *args) {
     wxString * _arg3;
     PyObject * _argo0 = 0;
     PyObject * _obj3 = 0;
+    char *_kwnames[] = { "self","from","to","text", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OllO:wxComboBox_Replace",&_argo0,&_arg1,&_arg2,&_obj3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OllO:wxComboBox_Replace",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1928,15 +1977,16 @@ static PyObject *_wrap_wxComboBox_Replace(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Remove(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Remove(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxComboBox_Remove(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Remove(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","from","to", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxComboBox_Remove",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxComboBox_Remove",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1956,14 +2006,15 @@ static PyObject *_wrap_wxComboBox_Remove(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_SetInsertionPoint(_swigobj,_swigarg0)  (_swigobj->SetInsertionPoint(_swigarg0))
-static PyObject *_wrap_wxComboBox_SetInsertionPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_SetInsertionPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxComboBox_SetInsertionPoint",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxComboBox_SetInsertionPoint",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1983,13 +2034,14 @@ static PyObject *_wrap_wxComboBox_SetInsertionPoint(PyObject *self, PyObject *ar
 }
 
 #define wxComboBox_SetInsertionPointEnd(_swigobj)  (_swigobj->SetInsertionPointEnd())
-static PyObject *_wrap_wxComboBox_SetInsertionPointEnd(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_SetInsertionPointEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_SetInsertionPointEnd",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_SetInsertionPointEnd",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2009,14 +2061,15 @@ static PyObject *_wrap_wxComboBox_SetInsertionPointEnd(PyObject *self, PyObject
 }
 
 #define wxComboBox_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
-static PyObject *_wrap_wxComboBox_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxComboBox_SetSelection",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxComboBox_SetSelection",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2036,15 +2089,16 @@ static PyObject *_wrap_wxComboBox_SetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_SetMark(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSelection(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxComboBox_SetMark(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_SetMark(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","from","to", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxComboBox_SetMark",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxComboBox_SetMark",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2064,15 +2118,16 @@ static PyObject *_wrap_wxComboBox_SetMark(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxComboBox_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","text", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxComboBox_SetValue",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxComboBox_SetValue",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2127,7 +2182,7 @@ static void *SwigwxGaugeTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxGauge(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxGauge(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
-static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGauge * _result;
     wxWindow * _arg0;
@@ -2139,13 +2194,16 @@ static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args) {
     wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
     char * _arg7 = (char *) "gauge";
     PyObject * _argo0 = 0;
-    PyObject * _argo3 = 0;
-    PyObject * _argo4 = 0;
+    wxPoint  temp;
+    PyObject * _obj3 = 0;
+    wxSize  temp0;
+    PyObject * _obj4 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","id","range","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii|OOlOs:new_wxGauge",&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|OOlOs:new_wxGauge",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3,&_obj4,&_arg5,&_argo6,&_arg7)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2154,20 +2212,18 @@ static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    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_wxGauge. Expected _wxPoint_p.");
+    if (_obj3)
+{
+    _arg3 = &temp;
+    if (! wxPoint_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
-    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_wxGauge. Expected _wxSize_p.");
+}
+    if (_obj4)
+{
+    _arg4 = &temp0;
+    if (! wxSize_helper(_obj4, &_arg4))
         return NULL;
-        }
-    }
+}
     if (_argo6) {
         if (_argo6 == Py_None) { _arg6 = NULL; }
         else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) {
@@ -2191,14 +2247,15 @@ static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_GetBezelFace(_swigobj)  (_swigobj->GetBezelFace())
-static PyObject *_wrap_wxGauge_GetBezelFace(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_GetBezelFace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGauge_GetBezelFace",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGauge_GetBezelFace",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2217,14 +2274,15 @@ static PyObject *_wrap_wxGauge_GetBezelFace(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_GetRange(_swigobj)  (_swigobj->GetRange())
-static PyObject *_wrap_wxGauge_GetRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_GetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGauge_GetRange",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGauge_GetRange",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2243,14 +2301,15 @@ static PyObject *_wrap_wxGauge_GetRange(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_GetShadowWidth(_swigobj)  (_swigobj->GetShadowWidth())
-static PyObject *_wrap_wxGauge_GetShadowWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_GetShadowWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGauge_GetShadowWidth",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGauge_GetShadowWidth",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2269,14 +2328,15 @@ static PyObject *_wrap_wxGauge_GetShadowWidth(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxGauge_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGauge_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGauge_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2295,14 +2355,15 @@ static PyObject *_wrap_wxGauge_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_SetBezelFace(_swigobj,_swigarg0)  (_swigobj->SetBezelFace(_swigarg0))
-static PyObject *_wrap_wxGauge_SetBezelFace(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_SetBezelFace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGauge_SetBezelFace",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGauge_SetBezelFace",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2322,14 +2383,15 @@ static PyObject *_wrap_wxGauge_SetBezelFace(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_SetRange(_swigobj,_swigarg0)  (_swigobj->SetRange(_swigarg0))
-static PyObject *_wrap_wxGauge_SetRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_SetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","range", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGauge_SetRange",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGauge_SetRange",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2349,14 +2411,15 @@ static PyObject *_wrap_wxGauge_SetRange(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_SetShadowWidth(_swigobj,_swigarg0)  (_swigobj->SetShadowWidth(_swigarg0))
-static PyObject *_wrap_wxGauge_SetShadowWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_SetShadowWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGauge_SetShadowWidth",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGauge_SetShadowWidth",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2376,14 +2439,15 @@ static PyObject *_wrap_wxGauge_SetShadowWidth(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxGauge_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGauge_SetValue",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGauge_SetValue",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2427,7 +2491,7 @@ static void *SwigwxStaticBoxTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxStaticBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxStaticBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticBox * _result;
     wxWindow * _arg0;
@@ -2439,12 +2503,15 @@ static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args) {
     char * _arg6 = (char *) "staticBox";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
-    PyObject * _argo3 = 0;
-    PyObject * _argo4 = 0;
+    wxPoint  temp;
+    PyObject * _obj3 = 0;
+    wxSize  temp0;
+    PyObject * _obj4 = 0;
+    char *_kwnames[] = { "parent","id","label","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxStaticBox",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxStaticBox",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2460,20 +2527,18 @@ static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
-    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_wxStaticBox. Expected _wxPoint_p.");
+    if (_obj3)
+{
+    _arg3 = &temp;
+    if (! wxPoint_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
-    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_wxStaticBox. Expected _wxSize_p.");
+}
+    if (_obj4)
+{
+    _arg4 = &temp0;
+    if (! wxSize_helper(_obj4, &_arg4))
         return NULL;
-        }
-    }
+}
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxStaticBox *)new_wxStaticBox(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
@@ -2518,7 +2583,7 @@ static void *SwigwxStaticLineTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxStaticLine(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxStaticLine(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticLine * _result;
     wxWindow * _arg0;
@@ -2528,12 +2593,15 @@ static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args) {
     long  _arg4 = (long ) wxLI_HORIZONTAL;
     char * _arg5 = (char *) "staticLine";
     PyObject * _argo0 = 0;
-    PyObject * _argo2 = 0;
-    PyObject * _argo3 = 0;
+    wxPoint  temp;
+    PyObject * _obj2 = 0;
+    wxSize  temp0;
+    PyObject * _obj3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxStaticLine",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxStaticLine",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2542,20 +2610,18 @@ static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args) {
         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 new_wxStaticLine. Expected _wxPoint_p.");
+    if (_obj2)
+{
+    _arg2 = &temp;
+    if (! wxPoint_helper(_obj2, &_arg2))
         return NULL;
-        }
-    }
-    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_wxStaticLine. Expected _wxSize_p.");
+}
+    if (_obj3)
+{
+    _arg3 = &temp0;
+    if (! wxSize_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
+}
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxStaticLine *)new_wxStaticLine(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
@@ -2596,7 +2662,7 @@ static void *SwigwxStaticTextTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxStaticText(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxStaticText(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticText * _result;
     wxWindow * _arg0;
@@ -2608,12 +2674,15 @@ static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args) {
     char * _arg6 = (char *) "staticText";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
-    PyObject * _argo3 = 0;
-    PyObject * _argo4 = 0;
+    wxPoint  temp;
+    PyObject * _obj3 = 0;
+    wxSize  temp0;
+    PyObject * _obj4 = 0;
+    char *_kwnames[] = { "parent","id","label","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxStaticText",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxStaticText",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2629,20 +2698,18 @@ static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
-    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_wxStaticText. Expected _wxPoint_p.");
+    if (_obj3)
+{
+    _arg3 = &temp;
+    if (! wxPoint_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
-    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_wxStaticText. Expected _wxSize_p.");
+}
+    if (_obj4)
+{
+    _arg4 = &temp0;
+    if (! wxSize_helper(_obj4, &_arg4))
         return NULL;
-        }
-    }
+}
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxStaticText *)new_wxStaticText(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
@@ -2663,14 +2730,15 @@ static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args) {
 }
 
 #define wxStaticText_GetLabel(_swigobj)  (_swigobj->GetLabel())
-static PyObject *_wrap_wxStaticText_GetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStaticText_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxStaticText * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxStaticText_GetLabel",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStaticText_GetLabel",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2694,15 +2762,16 @@ static PyObject *_wrap_wxStaticText_GetLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxStaticText_SetLabel(_swigobj,_swigarg0)  (_swigobj->SetLabel(_swigarg0))
-static PyObject *_wrap_wxStaticText_SetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStaticText_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticText * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","label", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxStaticText_SetLabel",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxStaticText_SetLabel",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2757,7 +2826,7 @@ static void *SwigwxListBoxTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8) (new wxListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8))
-static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _result;
     wxWindow * _arg0;
@@ -2770,14 +2839,17 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args) {
     wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator;
     char * _arg8 = (char *) "listBox";
     PyObject * _argo0 = 0;
-    PyObject * _argo2 = 0;
-    PyObject * _argo3 = 0;
+    wxPoint  temp;
+    PyObject * _obj2 = 0;
+    wxSize  temp0;
+    PyObject * _obj3 = 0;
     PyObject * _obj5 = 0;
     PyObject * _argo7 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","LIST","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOOlOs:new_wxListBox",&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOOlOs:new_wxListBox",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj5,&_arg6,&_argo7,&_arg8)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2786,20 +2858,18 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args) {
         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 new_wxListBox. Expected _wxPoint_p.");
+    if (_obj2)
+{
+    _arg2 = &temp;
+    if (! wxPoint_helper(_obj2, &_arg2))
         return NULL;
-        }
-    }
-    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_wxListBox. Expected _wxSize_p.");
+}
+    if (_obj3)
+{
+    _arg3 = &temp0;
+    if (! wxSize_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
+}
     if (_obj5)
 {
     _arg5 = wxString_LIST_helper(_obj5);
@@ -2841,15 +2911,16 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_Append(_swigobj,_swigarg0)  (_swigobj->Append(_swigarg0))
-static PyObject *_wrap_wxListBox_Append(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Append(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListBox_Append",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListBox_Append",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2880,13 +2951,14 @@ static PyObject *_wrap_wxListBox_Append(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_Clear(_swigobj)  (_swigobj->Clear())
-static PyObject *_wrap_wxListBox_Clear(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListBox_Clear",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListBox_Clear",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2906,14 +2978,15 @@ static PyObject *_wrap_wxListBox_Clear(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_Delete(_swigobj,_swigarg0)  (_swigobj->Delete(_swigarg0))
-static PyObject *_wrap_wxListBox_Delete(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Delete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListBox_Delete",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListBox_Delete",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2933,14 +3006,15 @@ static PyObject *_wrap_wxListBox_Delete(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_Deselect(_swigobj,_swigarg0)  (_swigobj->Deselect(_swigarg0))
-static PyObject *_wrap_wxListBox_Deselect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Deselect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListBox_Deselect",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListBox_Deselect",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2960,16 +3034,17 @@ static PyObject *_wrap_wxListBox_Deselect(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_FindString(_swigobj,_swigarg0)  (_swigobj->FindString(_swigarg0))
-static PyObject *_wrap_wxListBox_FindString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_FindString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListBox_FindString",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListBox_FindString",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2999,14 +3074,15 @@ static PyObject *_wrap_wxListBox_FindString(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxListBox_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListBox_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListBox_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3033,14 +3109,15 @@ static PyObject * wxListBox_GetSelections(wxListBox *self) {
           }
           return tup;
       }
-static PyObject *_wrap_wxListBox_GetSelections(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_GetSelections(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxListBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListBox_GetSelections",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListBox_GetSelections",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3060,16 +3137,65 @@ static PyObject *_wrap_wxListBox_GetSelections(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxListBox_InsertItems(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->InsertItems(_swigarg0,_swigarg1,_swigarg2))
+static PyObject *_wrap_wxListBox_InsertItems(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxListBox * _arg0;
+    int  _arg1;
+    wxString * _arg2;
+    int  _arg3;
+    PyObject * _argo0 = 0;
+    PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","LIST","pos", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxListBox_InsertItems",_kwnames,&_argo0,&_obj2,&_arg3)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_InsertItems. Expected _wxListBox_p.");
+        return NULL;
+        }
+    }
+{
+    _arg2 = wxString_LIST_helper(_obj2);
+    if (_arg2 == NULL) {
+        return NULL;
+    }
+}
+{
+    if (_obj2) {
+        _arg1 = PyList_Size(_obj2);
+    }
+    else {
+        _arg1 = 0;
+    }
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxListBox_InsertItems(_arg0,_arg1,_arg2,_arg3);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    delete [] _arg2;
+}
+    return _resultobj;
+}
+
 #define wxListBox_GetString(_swigobj,_swigarg0)  (_swigobj->GetString(_swigarg0))
-static PyObject *_wrap_wxListBox_GetString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListBox_GetString",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListBox_GetString",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3093,14 +3219,15 @@ static PyObject *_wrap_wxListBox_GetString(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_GetStringSelection(_swigobj)  (_swigobj->GetStringSelection())
-static PyObject *_wrap_wxListBox_GetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxListBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListBox_GetStringSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListBox_GetStringSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3124,14 +3251,15 @@ static PyObject *_wrap_wxListBox_GetStringSelection(PyObject *self, PyObject *ar
 }
 
 #define wxListBox_Number(_swigobj)  (_swigobj->Number())
-static PyObject *_wrap_wxListBox_Number(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Number(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListBox_Number",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListBox_Number",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3150,15 +3278,16 @@ static PyObject *_wrap_wxListBox_Number(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_Selected(_swigobj,_swigarg0)  (_swigobj->Selected(_swigarg0))
-static PyObject *_wrap_wxListBox_Selected(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Selected(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListBox_Selected",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListBox_Selected",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3177,16 +3306,17 @@ static PyObject *_wrap_wxListBox_Selected(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_Set(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Set(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListBox_Set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","LIST", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListBox_Set",&_argo0,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListBox_Set",_kwnames,&_argo0,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3224,14 +3354,15 @@ static PyObject *_wrap_wxListBox_Set(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_SetFirstItem(_swigobj,_swigarg0)  (_swigobj->SetFirstItem(_swigarg0))
-static PyObject *_wrap_wxListBox_SetFirstItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_SetFirstItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListBox_SetFirstItem",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListBox_SetFirstItem",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3251,15 +3382,16 @@ static PyObject *_wrap_wxListBox_SetFirstItem(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_SetFirstItemStr(_swigobj,_swigarg0)  (_swigobj->SetFirstItem(_swigarg0))
-static PyObject *_wrap_wxListBox_SetFirstItemStr(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_SetFirstItemStr(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListBox_SetFirstItemStr",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListBox_SetFirstItemStr",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3290,16 +3422,17 @@ static PyObject *_wrap_wxListBox_SetFirstItemStr(PyObject *self, PyObject *args)
 }
 
 #define wxListBox_SetSelection(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSelection(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListBox_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     bool  _arg2 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "self","n","select", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|i:wxListBox_SetSelection",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|i:wxListBox_SetSelection",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3320,16 +3453,17 @@ static PyObject *_wrap_wxListBox_SetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_SetString(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetString(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListBox_SetString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_SetString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","n","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxListBox_SetString",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxListBox_SetString",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3360,7 +3494,7 @@ static PyObject *_wrap_wxListBox_SetString(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_SetStringSelection(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetStringSelection(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListBox_SetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_SetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     wxString * _arg1;
@@ -3368,9 +3502,10 @@ static PyObject *_wrap_wxListBox_SetStringSelection(PyObject *self, PyObject *ar
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "self","string","select", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|i:wxListBox_SetStringSelection",&_argo0,&_obj1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxListBox_SetStringSelection",_kwnames,&_argo0,&_obj1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3434,7 +3569,7 @@ static void *SwigwxCheckListBoxTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxCheckListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8) (new wxCheckListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8))
-static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCheckListBox * _result;
     wxWindow * _arg0;
@@ -3447,14 +3582,17 @@ static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args) {
     wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator;
     char * _arg8 = (char *) "listBox";
     PyObject * _argo0 = 0;
-    PyObject * _argo2 = 0;
-    PyObject * _argo3 = 0;
+    wxPoint  temp;
+    PyObject * _obj2 = 0;
+    wxSize  temp0;
+    PyObject * _obj3 = 0;
     PyObject * _obj5 = 0;
     PyObject * _argo7 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","LIST","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOOlOs:new_wxCheckListBox",&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOOlOs:new_wxCheckListBox",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj5,&_arg6,&_argo7,&_arg8)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3463,20 +3601,18 @@ static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args) {
         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 new_wxCheckListBox. Expected _wxPoint_p.");
+    if (_obj2)
+{
+    _arg2 = &temp;
+    if (! wxPoint_helper(_obj2, &_arg2))
         return NULL;
-        }
-    }
-    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_wxCheckListBox. Expected _wxSize_p.");
+}
+    if (_obj3)
+{
+    _arg3 = &temp0;
+    if (! wxSize_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
+}
     if (_obj5)
 {
     _arg5 = wxString_LIST_helper(_obj5);
@@ -3518,15 +3654,16 @@ static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args) {
 }
 
 #define wxCheckListBox_IsChecked(_swigobj,_swigarg0)  (_swigobj->IsChecked(_swigarg0))
-static PyObject *_wrap_wxCheckListBox_IsChecked(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCheckListBox_IsChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxCheckListBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","uiIndex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxCheckListBox_IsChecked",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxCheckListBox_IsChecked",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3545,16 +3682,17 @@ static PyObject *_wrap_wxCheckListBox_IsChecked(PyObject *self, PyObject *args)
 }
 
 #define wxCheckListBox_Check(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Check(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxCheckListBox_Check(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCheckListBox_Check(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCheckListBox * _arg0;
     int  _arg1;
     bool  _arg2 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "self","uiIndex","bCheck", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|i:wxCheckListBox_Check",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|i:wxCheckListBox_Check",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3575,14 +3713,15 @@ static PyObject *_wrap_wxCheckListBox_Check(PyObject *self, PyObject *args) {
 }
 
 #define wxCheckListBox_GetItemHeight(_swigobj)  (_swigobj->GetItemHeight())
-static PyObject *_wrap_wxCheckListBox_GetItemHeight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCheckListBox_GetItemHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxCheckListBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCheckListBox_GetItemHeight",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCheckListBox_GetItemHeight",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3625,7 +3764,7 @@ static void *SwigwxTextCtrlTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxTextCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxTextCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
-static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _result;
     wxWindow * _arg0;
@@ -3637,13 +3776,16 @@ static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args) {
     wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
     char * _arg7 = (char *) "text";
     PyObject * _argo0 = 0;
-    PyObject * _argo3 = 0;
-    PyObject * _argo4 = 0;
+    wxPoint  temp;
+    PyObject * _obj3 = 0;
+    wxSize  temp0;
+    PyObject * _obj4 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","id","value","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|sOOlOs:new_wxTextCtrl",&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|sOOlOs:new_wxTextCtrl",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3,&_obj4,&_arg5,&_argo6,&_arg7)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3652,20 +3794,18 @@ static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    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_wxTextCtrl. Expected _wxPoint_p.");
+    if (_obj3)
+{
+    _arg3 = &temp;
+    if (! wxPoint_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
-    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_wxTextCtrl. Expected _wxSize_p.");
+}
+    if (_obj4)
+{
+    _arg4 = &temp0;
+    if (! wxSize_helper(_obj4, &_arg4))
         return NULL;
-        }
-    }
+}
     if (_argo6) {
         if (_argo6 == Py_None) { _arg6 = NULL; }
         else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) {
@@ -3689,13 +3829,14 @@ static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_Clear(_swigobj)  (_swigobj->Clear())
-static PyObject *_wrap_wxTextCtrl_Clear(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_Clear",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_Clear",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3715,13 +3856,14 @@ static PyObject *_wrap_wxTextCtrl_Clear(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_Copy(_swigobj)  (_swigobj->Copy())
-static PyObject *_wrap_wxTextCtrl_Copy(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_Copy",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_Copy",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3741,13 +3883,14 @@ static PyObject *_wrap_wxTextCtrl_Copy(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_Cut(_swigobj)  (_swigobj->Cut())
-static PyObject *_wrap_wxTextCtrl_Cut(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_Cut(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_Cut",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_Cut",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3767,13 +3910,14 @@ static PyObject *_wrap_wxTextCtrl_Cut(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_DiscardEdits(_swigobj)  (_swigobj->DiscardEdits())
-static PyObject *_wrap_wxTextCtrl_DiscardEdits(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_DiscardEdits(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_DiscardEdits",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_DiscardEdits",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3793,14 +3937,15 @@ static PyObject *_wrap_wxTextCtrl_DiscardEdits(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_GetInsertionPoint(_swigobj)  (_swigobj->GetInsertionPoint())
-static PyObject *_wrap_wxTextCtrl_GetInsertionPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetInsertionPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetInsertionPoint",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_GetInsertionPoint",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3819,14 +3964,15 @@ static PyObject *_wrap_wxTextCtrl_GetInsertionPoint(PyObject *self, PyObject *ar
 }
 
 #define wxTextCtrl_GetLastPosition(_swigobj)  (_swigobj->GetLastPosition())
-static PyObject *_wrap_wxTextCtrl_GetLastPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetLastPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetLastPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_GetLastPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3845,15 +3991,16 @@ static PyObject *_wrap_wxTextCtrl_GetLastPosition(PyObject *self, PyObject *args
 }
 
 #define wxTextCtrl_GetLineLength(_swigobj,_swigarg0)  (_swigobj->GetLineLength(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_GetLineLength(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetLineLength(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxTextCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","lineNo", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_GetLineLength",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxTextCtrl_GetLineLength",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3872,15 +4019,16 @@ static PyObject *_wrap_wxTextCtrl_GetLineLength(PyObject *self, PyObject *args)
 }
 
 #define wxTextCtrl_GetLineText(_swigobj,_swigarg0)  (_swigobj->GetLineText(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_GetLineText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetLineText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxTextCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","lineNo", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_GetLineText",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxTextCtrl_GetLineText",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3904,14 +4052,15 @@ static PyObject *_wrap_wxTextCtrl_GetLineText(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_GetNumberOfLines(_swigobj)  (_swigobj->GetNumberOfLines())
-static PyObject *_wrap_wxTextCtrl_GetNumberOfLines(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetNumberOfLines(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetNumberOfLines",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_GetNumberOfLines",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3930,14 +4079,15 @@ static PyObject *_wrap_wxTextCtrl_GetNumberOfLines(PyObject *self, PyObject *arg
 }
 
 #define wxTextCtrl_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxTextCtrl_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3961,14 +4111,15 @@ static PyObject *_wrap_wxTextCtrl_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_IsModified(_swigobj)  (_swigobj->IsModified())
-static PyObject *_wrap_wxTextCtrl_IsModified(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_IsModified(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_IsModified",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_IsModified",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3987,16 +4138,17 @@ static PyObject *_wrap_wxTextCtrl_IsModified(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_LoadFile(_swigobj,_swigarg0)  (_swigobj->LoadFile(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_LoadFile(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","filename", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_LoadFile",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextCtrl_LoadFile",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4026,13 +4178,14 @@ static PyObject *_wrap_wxTextCtrl_LoadFile(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_Paste(_swigobj)  (_swigobj->Paste())
-static PyObject *_wrap_wxTextCtrl_Paste(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_Paste(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_Paste",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_Paste",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4052,7 +4205,7 @@ static PyObject *_wrap_wxTextCtrl_Paste(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_PositionToXY(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->PositionToXY(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
@@ -4061,6 +4214,7 @@ static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args) {
     long * _arg3;
     long  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
 {
@@ -4069,7 +4223,7 @@ static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args) {
 {
   _arg3 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_PositionToXY",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxTextCtrl_PositionToXY",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4099,15 +4253,16 @@ static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_Remove(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Remove(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTextCtrl_Remove(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_Remove(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","from","to", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxTextCtrl_Remove",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxTextCtrl_Remove",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4127,7 +4282,7 @@ static PyObject *_wrap_wxTextCtrl_Remove(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_Replace(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->Replace(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxTextCtrl_Replace(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_Replace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
@@ -4135,9 +4290,10 @@ static PyObject *_wrap_wxTextCtrl_Replace(PyObject *self, PyObject *args) {
     wxString * _arg3;
     PyObject * _argo0 = 0;
     PyObject * _obj3 = 0;
+    char *_kwnames[] = { "self","from","to","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OllO:wxTextCtrl_Replace",&_argo0,&_arg1,&_arg2,&_obj3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OllO:wxTextCtrl_Replace",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4168,16 +4324,17 @@ static PyObject *_wrap_wxTextCtrl_Replace(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_SaveFile(_swigobj,_swigarg0)  (_swigobj->SaveFile(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_SaveFile(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_SaveFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","filename", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_SaveFile",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextCtrl_SaveFile",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4207,15 +4364,16 @@ static PyObject *_wrap_wxTextCtrl_SaveFile(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_SetEditable(_swigobj,_swigarg0)  (_swigobj->SetEditable(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_SetEditable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_SetEditable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","editable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxTextCtrl_SetEditable",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxTextCtrl_SetEditable",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4236,14 +4394,15 @@ static PyObject *_wrap_wxTextCtrl_SetEditable(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_SetInsertionPoint(_swigobj,_swigarg0)  (_swigobj->SetInsertionPoint(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_SetInsertionPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_SetInsertionPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_SetInsertionPoint",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxTextCtrl_SetInsertionPoint",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4263,13 +4422,14 @@ static PyObject *_wrap_wxTextCtrl_SetInsertionPoint(PyObject *self, PyObject *ar
 }
 
 #define wxTextCtrl_SetInsertionPointEnd(_swigobj)  (_swigobj->SetInsertionPointEnd())
-static PyObject *_wrap_wxTextCtrl_SetInsertionPointEnd(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_SetInsertionPointEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_SetInsertionPointEnd",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_SetInsertionPointEnd",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4289,15 +4449,16 @@ static PyObject *_wrap_wxTextCtrl_SetInsertionPointEnd(PyObject *self, PyObject
 }
 
 #define wxTextCtrl_SetSelection(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSelection(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTextCtrl_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","from","to", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxTextCtrl_SetSelection",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxTextCtrl_SetSelection",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4317,15 +4478,16 @@ static PyObject *_wrap_wxTextCtrl_SetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_SetValue",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextCtrl_SetValue",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4356,14 +4518,15 @@ static PyObject *_wrap_wxTextCtrl_SetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_ShowPosition(_swigobj,_swigarg0)  (_swigobj->ShowPosition(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_ShowPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_ShowPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_ShowPosition",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxTextCtrl_ShowPosition",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4383,15 +4546,16 @@ static PyObject *_wrap_wxTextCtrl_ShowPosition(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_WriteText(_swigobj,_swigarg0)  (_swigobj->WriteText(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_WriteText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_WriteText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","text", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_WriteText",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextCtrl_WriteText",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4422,15 +4586,16 @@ static PyObject *_wrap_wxTextCtrl_WriteText(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_AppendText(_swigobj,_swigarg0)  (_swigobj->AppendText(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_AppendText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_AppendText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","text", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_AppendText",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextCtrl_AppendText",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4461,16 +4626,17 @@ static PyObject *_wrap_wxTextCtrl_AppendText(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_XYToPosition(_swigobj,_swigarg0,_swigarg1)  (_swigobj->XYToPosition(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTextCtrl_XYToPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_XYToPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxTextCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxTextCtrl_XYToPosition",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxTextCtrl_XYToPosition",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4489,14 +4655,15 @@ static PyObject *_wrap_wxTextCtrl_XYToPosition(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_CanCopy(_swigobj)  (_swigobj->CanCopy())
-static PyObject *_wrap_wxTextCtrl_CanCopy(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_CanCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanCopy",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_CanCopy",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4515,14 +4682,15 @@ static PyObject *_wrap_wxTextCtrl_CanCopy(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_CanCut(_swigobj)  (_swigobj->CanCut())
-static PyObject *_wrap_wxTextCtrl_CanCut(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_CanCut(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanCut",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_CanCut",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4541,14 +4709,15 @@ static PyObject *_wrap_wxTextCtrl_CanCut(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_CanPaste(_swigobj)  (_swigobj->CanPaste())
-static PyObject *_wrap_wxTextCtrl_CanPaste(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_CanPaste(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanPaste",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_CanPaste",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4567,14 +4736,15 @@ static PyObject *_wrap_wxTextCtrl_CanPaste(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_CanRedo(_swigobj)  (_swigobj->CanRedo())
-static PyObject *_wrap_wxTextCtrl_CanRedo(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_CanRedo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanRedo",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_CanRedo",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4593,14 +4763,15 @@ static PyObject *_wrap_wxTextCtrl_CanRedo(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_CanUndo(_swigobj)  (_swigobj->CanUndo())
-static PyObject *_wrap_wxTextCtrl_CanUndo(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_CanUndo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanUndo",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_CanUndo",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4619,7 +4790,7 @@ static PyObject *_wrap_wxTextCtrl_CanUndo(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_GetSelection(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetSelection(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTextCtrl_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long * _arg1;
@@ -4627,6 +4798,7 @@ static PyObject *_wrap_wxTextCtrl_GetSelection(PyObject *self, PyObject *args) {
     long * _arg2;
     long  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -4635,7 +4807,7 @@ static PyObject *_wrap_wxTextCtrl_GetSelection(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4665,14 +4837,15 @@ static PyObject *_wrap_wxTextCtrl_GetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_IsEditable(_swigobj)  (_swigobj->IsEditable())
-static PyObject *_wrap_wxTextCtrl_IsEditable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_IsEditable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_IsEditable",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_IsEditable",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4690,6 +4863,102 @@ static PyObject *_wrap_wxTextCtrl_IsEditable(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxTextCtrl_Undo(_swigobj)  (_swigobj->Undo())
+static PyObject *_wrap_wxTextCtrl_Undo(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxTextCtrl * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_Undo",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Undo. Expected _wxTextCtrl_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxTextCtrl_Undo(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxTextCtrl_Redo(_swigobj)  (_swigobj->Redo())
+static PyObject *_wrap_wxTextCtrl_Redo(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxTextCtrl * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_Redo",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Redo. Expected _wxTextCtrl_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxTextCtrl_Redo(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+static void  wxTextCtrl_write(wxTextCtrl *self,const wxString & text) {
+            self->AppendText(text + '\n');
+        }
+static PyObject *_wrap_wxTextCtrl_write(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxTextCtrl * _arg0;
+    wxString * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","text", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextCtrl_write",_kwnames,&_argo0,&_obj1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_write. Expected _wxTextCtrl_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;
+        wxTextCtrl_write(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
 static void *SwigwxScrollBarTowxControl(void *ptr) {
     wxScrollBar *src;
     wxControl *dest;
@@ -4715,7 +4984,7 @@ static void *SwigwxScrollBarTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxScrollBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxScrollBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrollBar * _result;
     wxWindow * _arg0;
@@ -4726,13 +4995,16 @@ static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args) {
     wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator;
     char * _arg6 = (char *) "scrollBar";
     PyObject * _argo0 = 0;
-    PyObject * _argo2 = 0;
-    PyObject * _argo3 = 0;
+    wxPoint  temp;
+    PyObject * _obj2 = 0;
+    wxSize  temp0;
+    PyObject * _obj3 = 0;
     PyObject * _argo5 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|iOOlOs:new_wxScrollBar",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_argo5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOlOs:new_wxScrollBar",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_argo5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4741,20 +5013,18 @@ static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args) {
         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 new_wxScrollBar. Expected _wxPoint_p.");
+    if (_obj2)
+{
+    _arg2 = &temp;
+    if (! wxPoint_helper(_obj2, &_arg2))
         return NULL;
-        }
-    }
-    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_wxScrollBar. Expected _wxSize_p.");
+}
+    if (_obj3)
+{
+    _arg3 = &temp0;
+    if (! wxSize_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
+}
     if (_argo5) {
         if (_argo5 == Py_None) { _arg5 = NULL; }
         else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxValidator_p")) {
@@ -4778,14 +5048,15 @@ static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args) {
 }
 
 #define wxScrollBar_GetRange(_swigobj)  (_swigobj->GetRange())
-static PyObject *_wrap_wxScrollBar_GetRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollBar_GetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxScrollBar_GetRange",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrollBar_GetRange",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4804,14 +5075,15 @@ static PyObject *_wrap_wxScrollBar_GetRange(PyObject *self, PyObject *args) {
 }
 
 #define wxScrollBar_GetPageSize(_swigobj)  (_swigobj->GetPageSize())
-static PyObject *_wrap_wxScrollBar_GetPageSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollBar_GetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxScrollBar_GetPageSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrollBar_GetPageSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4830,14 +5102,15 @@ static PyObject *_wrap_wxScrollBar_GetPageSize(PyObject *self, PyObject *args) {
 }
 
 #define wxScrollBar_GetThumbPosition(_swigobj)  (_swigobj->GetThumbPosition())
-static PyObject *_wrap_wxScrollBar_GetThumbPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollBar_GetThumbPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxScrollBar_GetThumbPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrollBar_GetThumbPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4856,14 +5129,15 @@ static PyObject *_wrap_wxScrollBar_GetThumbPosition(PyObject *self, PyObject *ar
 }
 
 #define wxScrollBar_GetThumbSize(_swigobj)  (_swigobj->GetThumbSize())
-static PyObject *_wrap_wxScrollBar_GetThumbSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollBar_GetThumbSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxScrollBar_GetThumbSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrollBar_GetThumbSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4882,14 +5156,15 @@ static PyObject *_wrap_wxScrollBar_GetThumbSize(PyObject *self, PyObject *args)
 }
 
 #define wxScrollBar_SetThumbPosition(_swigobj,_swigarg0)  (_swigobj->SetThumbPosition(_swigarg0))
-static PyObject *_wrap_wxScrollBar_SetThumbPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollBar_SetThumbPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrollBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","viewStart", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxScrollBar_SetThumbPosition",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxScrollBar_SetThumbPosition",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4909,7 +5184,7 @@ static PyObject *_wrap_wxScrollBar_SetThumbPosition(PyObject *self, PyObject *ar
 }
 
 #define wxScrollBar_SetScrollbar(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->SetScrollbar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_wxScrollBar_SetScrollbar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollBar_SetScrollbar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrollBar * _arg0;
     int  _arg1;
@@ -4919,9 +5194,10 @@ static PyObject *_wrap_wxScrollBar_SetScrollbar(PyObject *self, PyObject *args)
     bool  _arg5 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool5 = (int) TRUE;
+    char *_kwnames[] = { "self","position","thumbSize","range","pageSize","refresh", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oiiii|i:wxScrollBar_SetScrollbar",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|i:wxScrollBar_SetScrollbar",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4966,7 +5242,7 @@ static void *SwigwxSpinButtonTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxSpinButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSpinButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSpinButton * _result;
     wxWindow * _arg0;
@@ -4976,12 +5252,15 @@ static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args) {
     long  _arg4 = (long ) wxSP_HORIZONTAL;
     char * _arg5 = (char *) "spinButton";
     PyObject * _argo0 = 0;
-    PyObject * _argo2 = 0;
-    PyObject * _argo3 = 0;
+    wxPoint  temp;
+    PyObject * _obj2 = 0;
+    wxSize  temp0;
+    PyObject * _obj3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|iOOls:new_wxSpinButton",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOls:new_wxSpinButton",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4990,20 +5269,18 @@ static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args) {
         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 new_wxSpinButton. Expected _wxPoint_p.");
+    if (_obj2)
+{
+    _arg2 = &temp;
+    if (! wxPoint_helper(_obj2, &_arg2))
         return NULL;
-        }
-    }
-    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_wxSpinButton. Expected _wxSize_p.");
+}
+    if (_obj3)
+{
+    _arg3 = &temp0;
+    if (! wxSize_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
+}
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxSpinButton *)new_wxSpinButton(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
@@ -5020,14 +5297,15 @@ static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args) {
 }
 
 #define wxSpinButton_GetMax(_swigobj)  (_swigobj->GetMax())
-static PyObject *_wrap_wxSpinButton_GetMax(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSpinButton_GetMax(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSpinButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSpinButton_GetMax",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSpinButton_GetMax",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5046,14 +5324,15 @@ static PyObject *_wrap_wxSpinButton_GetMax(PyObject *self, PyObject *args) {
 }
 
 #define wxSpinButton_GetMin(_swigobj)  (_swigobj->GetMin())
-static PyObject *_wrap_wxSpinButton_GetMin(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSpinButton_GetMin(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSpinButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSpinButton_GetMin",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSpinButton_GetMin",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5072,14 +5351,15 @@ static PyObject *_wrap_wxSpinButton_GetMin(PyObject *self, PyObject *args) {
 }
 
 #define wxSpinButton_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxSpinButton_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSpinButton_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSpinButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSpinButton_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSpinButton_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5098,15 +5378,16 @@ static PyObject *_wrap_wxSpinButton_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxSpinButton_SetRange(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetRange(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxSpinButton_SetRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSpinButton_SetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSpinButton * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","min","max", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxSpinButton_SetRange",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxSpinButton_SetRange",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5126,14 +5407,15 @@ static PyObject *_wrap_wxSpinButton_SetRange(PyObject *self, PyObject *args) {
 }
 
 #define wxSpinButton_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxSpinButton_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSpinButton_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSpinButton * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSpinButton_SetValue",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSpinButton_SetValue",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5177,7 +5459,7 @@ static void *SwigwxStaticBitmapTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxStaticBitmap(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxStaticBitmap(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticBitmap * _result;
     wxWindow * _arg0;
@@ -5189,12 +5471,15 @@ static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args) {
     char * _arg6 = (char *) "staticBitmap";
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
-    PyObject * _argo3 = 0;
-    PyObject * _argo4 = 0;
+    wxPoint  temp;
+    PyObject * _obj3 = 0;
+    wxSize  temp0;
+    PyObject * _obj4 = 0;
+    char *_kwnames[] = { "parent","id","bitmap","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxStaticBitmap",&_argo0,&_arg1,&_argo2,&_argo3,&_argo4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxStaticBitmap",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&_obj4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5210,20 +5495,18 @@ static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    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_wxStaticBitmap. Expected _wxPoint_p.");
+    if (_obj3)
+{
+    _arg3 = &temp;
+    if (! wxPoint_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
-    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_wxStaticBitmap. Expected _wxSize_p.");
+}
+    if (_obj4)
+{
+    _arg4 = &temp0;
+    if (! wxSize_helper(_obj4, &_arg4))
         return NULL;
-        }
-    }
+}
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxStaticBitmap *)new_wxStaticBitmap(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
@@ -5240,15 +5523,16 @@ static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args) {
 }
 
 #define wxStaticBitmap_GetBitmap(_swigobj)  (_swigobj->GetBitmap())
-static PyObject *_wrap_wxStaticBitmap_GetBitmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStaticBitmap_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxStaticBitmap * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxStaticBitmap_GetBitmap",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStaticBitmap_GetBitmap",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5274,15 +5558,16 @@ static PyObject *_wrap_wxStaticBitmap_GetBitmap(PyObject *self, PyObject *args)
 }
 
 #define wxStaticBitmap_SetBitmap(_swigobj,_swigarg0)  (_swigobj->SetBitmap(_swigarg0))
-static PyObject *_wrap_wxStaticBitmap_SetBitmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStaticBitmap_SetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticBitmap * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","bitmap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxStaticBitmap_SetBitmap",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxStaticBitmap_SetBitmap",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5309,15 +5594,16 @@ static PyObject *_wrap_wxStaticBitmap_SetBitmap(PyObject *self, PyObject *args)
 }
 
 #define wxStaticBitmap_SetIcon(_swigobj,_swigarg0)  (_swigobj->SetIcon(_swigarg0))
-static PyObject *_wrap_wxStaticBitmap_SetIcon(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStaticBitmap_SetIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticBitmap * _arg0;
     wxIcon * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","icon", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxStaticBitmap_SetIcon",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxStaticBitmap_SetIcon",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5368,7 +5654,7 @@ static void *SwigwxRadioBoxTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxRadioBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9,_swigarg10) (new wxRadioBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9,_swigarg10))
-static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _result;
     wxWindow * _arg0;
@@ -5384,14 +5670,17 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args) {
     char * _arg10 = (char *) "radioBox";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
-    PyObject * _argo3 = 0;
-    PyObject * _argo4 = 0;
+    wxPoint  temp;
+    PyObject * _obj3 = 0;
+    wxSize  temp0;
+    PyObject * _obj4 = 0;
     PyObject * _obj6 = 0;
     PyObject * _argo9 = 0;
+    char *_kwnames[] = { "parent","id","label","point","size","LIST","majorDimension","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOOilOs:new_wxRadioBox",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_obj6,&_arg7,&_arg8,&_argo9,&_arg10)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOOilOs:new_wxRadioBox",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_obj6,&_arg7,&_arg8,&_argo9,&_arg10)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5407,20 +5696,18 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
-    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_wxRadioBox. Expected _wxPoint_p.");
+    if (_obj3)
+{
+    _arg3 = &temp;
+    if (! wxPoint_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
-    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_wxRadioBox. Expected _wxSize_p.");
+}
+    if (_obj4)
+{
+    _arg4 = &temp0;
+    if (! wxSize_helper(_obj4, &_arg4))
         return NULL;
-        }
-    }
+}
     if (_obj6)
 {
     _arg6 = wxString_LIST_helper(_obj6);
@@ -5466,15 +5753,16 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_Enable(_swigobj,_swigarg0)  (_swigobj->Enable(_swigarg0))
-static PyObject *_wrap_wxRadioBox_Enable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_Enable",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRadioBox_Enable",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5495,16 +5783,17 @@ static PyObject *_wrap_wxRadioBox_Enable(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_EnableItem(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Enable(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxRadioBox_EnableItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_EnableItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
+    char *_kwnames[] = { "self","n","enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxRadioBox_EnableItem",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxRadioBox_EnableItem",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5525,16 +5814,17 @@ static PyObject *_wrap_wxRadioBox_EnableItem(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_FindString(_swigobj,_swigarg0)  (_swigobj->FindString(_swigarg0))
-static PyObject *_wrap_wxRadioBox_FindString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_FindString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxRadioBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxRadioBox_FindString",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRadioBox_FindString",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5564,15 +5854,16 @@ static PyObject *_wrap_wxRadioBox_FindString(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_GetItemLabel(_swigobj,_swigarg0)  (_swigobj->GetLabel(_swigarg0))
-static PyObject *_wrap_wxRadioBox_GetItemLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_GetItemLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxRadioBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_GetItemLabel",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRadioBox_GetItemLabel",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5596,14 +5887,15 @@ static PyObject *_wrap_wxRadioBox_GetItemLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxRadioBox_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxRadioBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRadioBox_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRadioBox_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5622,15 +5914,16 @@ static PyObject *_wrap_wxRadioBox_GetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_GetString(_swigobj,_swigarg0)  (_swigobj->GetString(_swigarg0))
-static PyObject *_wrap_wxRadioBox_GetString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxRadioBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_GetString",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRadioBox_GetString",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5654,14 +5947,15 @@ static PyObject *_wrap_wxRadioBox_GetString(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_GetStringSelection(_swigobj)  (_swigobj->GetStringSelection())
-static PyObject *_wrap_wxRadioBox_GetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxRadioBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRadioBox_GetStringSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRadioBox_GetStringSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5685,14 +5979,15 @@ static PyObject *_wrap_wxRadioBox_GetStringSelection(PyObject *self, PyObject *a
 }
 
 #define wxRadioBox_Number(_swigobj)  (_swigobj->Number())
-static PyObject *_wrap_wxRadioBox_Number(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_Number(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxRadioBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRadioBox_Number",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRadioBox_Number",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5711,16 +6006,17 @@ static PyObject *_wrap_wxRadioBox_Number(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_SetItemLabel(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabel(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxRadioBox_SetItemLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_SetItemLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","n","label", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxRadioBox_SetItemLabel",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxRadioBox_SetItemLabel",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5751,14 +6047,15 @@ static PyObject *_wrap_wxRadioBox_SetItemLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
-static PyObject *_wrap_wxRadioBox_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_SetSelection",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRadioBox_SetSelection",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5778,15 +6075,16 @@ static PyObject *_wrap_wxRadioBox_SetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_SetStringSelection(_swigobj,_swigarg0)  (_swigobj->SetStringSelection(_swigarg0))
-static PyObject *_wrap_wxRadioBox_SetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_SetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxRadioBox_SetStringSelection",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRadioBox_SetStringSelection",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5817,15 +6115,16 @@ static PyObject *_wrap_wxRadioBox_SetStringSelection(PyObject *self, PyObject *a
 }
 
 #define wxRadioBox_Show(_swigobj,_swigarg0)  (_swigobj->Show(_swigarg0))
-static PyObject *_wrap_wxRadioBox_Show(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","show", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_Show",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRadioBox_Show",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5846,16 +6145,17 @@ static PyObject *_wrap_wxRadioBox_Show(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_ShowItem(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Show(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxRadioBox_ShowItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_ShowItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
+    char *_kwnames[] = { "self","item","show", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxRadioBox_ShowItem",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxRadioBox_ShowItem",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5900,7 +6200,7 @@ static void *SwigwxRadioButtonTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxRadioButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxRadioButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
-static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioButton * _result;
     wxWindow * _arg0;
@@ -5913,13 +6213,16 @@ static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args) {
     char * _arg7 = (char *) "radioButton";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
-    PyObject * _argo3 = 0;
-    PyObject * _argo4 = 0;
+    wxPoint  temp;
+    PyObject * _obj3 = 0;
+    wxSize  temp0;
+    PyObject * _obj4 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","id","label","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOlOs:new_wxRadioButton",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxRadioButton",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_argo6,&_arg7)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5935,20 +6238,18 @@ static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
-    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_wxRadioButton. Expected _wxPoint_p.");
+    if (_obj3)
+{
+    _arg3 = &temp;
+    if (! wxPoint_helper(_obj3, &_arg3))
         return NULL;
-        }
-    }
-    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_wxRadioButton. Expected _wxSize_p.");
+}
+    if (_obj4)
+{
+    _arg4 = &temp0;
+    if (! wxSize_helper(_obj4, &_arg4))
         return NULL;
-        }
-    }
+}
     if (_argo6) {
         if (_argo6 == Py_None) { _arg6 = NULL; }
         else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) {
@@ -5976,14 +6277,15 @@ static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioButton_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxRadioButton_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioButton_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxRadioButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRadioButton_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRadioButton_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6002,15 +6304,16 @@ static PyObject *_wrap_wxRadioButton_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioButton_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxRadioButton_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioButton_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioButton * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxRadioButton_SetValue",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRadioButton_SetValue",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6055,7 +6358,7 @@ static void *SwigwxSliderTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxSlider(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9) (new wxSlider(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9))
-static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _result;
     wxWindow * _arg0;
@@ -6069,13 +6372,16 @@ static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args) {
     wxValidator * _arg8 = (wxValidator *) &wxPyDefaultValidator;
     char * _arg9 = (char *) "slider";
     PyObject * _argo0 = 0;
-    PyObject * _argo5 = 0;
-    PyObject * _argo6 = 0;
+    wxPoint  temp;
+    PyObject * _obj5 = 0;
+    wxSize  temp0;
+    PyObject * _obj6 = 0;
     PyObject * _argo8 = 0;
+    char *_kwnames[] = { "parent","id","value","minValue","maxValue","point","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oiiii|OOlOs:new_wxSlider",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5,&_argo6,&_arg7,&_argo8,&_arg9)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|OOlOs:new_wxSlider",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_obj5,&_obj6,&_arg7,&_argo8,&_arg9)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6084,20 +6390,18 @@ static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    if (_argo5) {
-        if (_argo5 == Py_None) { _arg5 = NULL; }
-        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxSlider. Expected _wxPoint_p.");
+    if (_obj5)
+{
+    _arg5 = &temp;
+    if (! wxPoint_helper(_obj5, &_arg5))
         return NULL;
-        }
-    }
-    if (_argo6) {
-        if (_argo6 == Py_None) { _arg6 = NULL; }
-        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxSlider. Expected _wxSize_p.");
+}
+    if (_obj6)
+{
+    _arg6 = &temp0;
+    if (! wxSize_helper(_obj6, &_arg6))
         return NULL;
-        }
-    }
+}
     if (_argo8) {
         if (_argo8 == Py_None) { _arg8 = NULL; }
         else if (SWIG_GetPtrObj(_argo8,(void **) &_arg8,"_wxValidator_p")) {
@@ -6121,13 +6425,14 @@ static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_ClearSel(_swigobj)  (_swigobj->ClearSel())
-static PyObject *_wrap_wxSlider_ClearSel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_ClearSel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_ClearSel",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_ClearSel",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6147,13 +6452,14 @@ static PyObject *_wrap_wxSlider_ClearSel(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_ClearTicks(_swigobj)  (_swigobj->ClearTicks())
-static PyObject *_wrap_wxSlider_ClearTicks(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_ClearTicks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_ClearTicks",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_ClearTicks",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6173,14 +6479,15 @@ static PyObject *_wrap_wxSlider_ClearTicks(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetLineSize(_swigobj)  (_swigobj->GetLineSize())
-static PyObject *_wrap_wxSlider_GetLineSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetLineSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetLineSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetLineSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6199,14 +6506,15 @@ static PyObject *_wrap_wxSlider_GetLineSize(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetMax(_swigobj)  (_swigobj->GetMax())
-static PyObject *_wrap_wxSlider_GetMax(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetMax(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetMax",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetMax",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6225,14 +6533,15 @@ static PyObject *_wrap_wxSlider_GetMax(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetMin(_swigobj)  (_swigobj->GetMin())
-static PyObject *_wrap_wxSlider_GetMin(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetMin(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetMin",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetMin",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6251,14 +6560,15 @@ static PyObject *_wrap_wxSlider_GetMin(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetPageSize(_swigobj)  (_swigobj->GetPageSize())
-static PyObject *_wrap_wxSlider_GetPageSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetPageSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetPageSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6277,14 +6587,15 @@ static PyObject *_wrap_wxSlider_GetPageSize(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetSelEnd(_swigobj)  (_swigobj->GetSelEnd())
-static PyObject *_wrap_wxSlider_GetSelEnd(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetSelEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetSelEnd",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetSelEnd",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6303,14 +6614,15 @@ static PyObject *_wrap_wxSlider_GetSelEnd(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetSelStart(_swigobj)  (_swigobj->GetSelStart())
-static PyObject *_wrap_wxSlider_GetSelStart(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetSelStart(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetSelStart",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetSelStart",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6329,14 +6641,15 @@ static PyObject *_wrap_wxSlider_GetSelStart(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetThumbLength(_swigobj)  (_swigobj->GetThumbLength())
-static PyObject *_wrap_wxSlider_GetThumbLength(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetThumbLength(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetThumbLength",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetThumbLength",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6355,14 +6668,15 @@ static PyObject *_wrap_wxSlider_GetThumbLength(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetTickFreq(_swigobj)  (_swigobj->GetTickFreq())
-static PyObject *_wrap_wxSlider_GetTickFreq(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetTickFreq(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetTickFreq",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetTickFreq",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6381,14 +6695,15 @@ static PyObject *_wrap_wxSlider_GetTickFreq(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxSlider_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6407,15 +6722,16 @@ static PyObject *_wrap_wxSlider_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetRange(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetRange(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxSlider_SetRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","minValue","maxValue", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxSlider_SetRange",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxSlider_SetRange",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6435,15 +6751,16 @@ static PyObject *_wrap_wxSlider_SetRange(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetTickFreq(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetTickFreq(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxSlider_SetTickFreq(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetTickFreq(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxSlider_SetTickFreq",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxSlider_SetTickFreq",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6463,14 +6780,15 @@ static PyObject *_wrap_wxSlider_SetTickFreq(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetLineSize(_swigobj,_swigarg0)  (_swigobj->SetLineSize(_swigarg0))
-static PyObject *_wrap_wxSlider_SetLineSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetLineSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","lineSize", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetLineSize",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSlider_SetLineSize",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6490,14 +6808,15 @@ static PyObject *_wrap_wxSlider_SetLineSize(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetPageSize(_swigobj,_swigarg0)  (_swigobj->SetPageSize(_swigarg0))
-static PyObject *_wrap_wxSlider_SetPageSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pageSize", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetPageSize",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSlider_SetPageSize",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6517,15 +6836,16 @@ static PyObject *_wrap_wxSlider_SetPageSize(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetSelection(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSelection(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxSlider_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","startPos","endPos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxSlider_SetSelection",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxSlider_SetSelection",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6545,14 +6865,15 @@ static PyObject *_wrap_wxSlider_SetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetThumbLength(_swigobj,_swigarg0)  (_swigobj->SetThumbLength(_swigarg0))
-static PyObject *_wrap_wxSlider_SetThumbLength(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetThumbLength(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","len", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetThumbLength",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSlider_SetThumbLength",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6572,14 +6893,15 @@ static PyObject *_wrap_wxSlider_SetThumbLength(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetTick(_swigobj,_swigarg0)  (_swigobj->SetTick(_swigarg0))
-static PyObject *_wrap_wxSlider_SetTick(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetTick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","tickPos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetTick",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSlider_SetTick",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6599,14 +6921,15 @@ static PyObject *_wrap_wxSlider_SetTick(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxSlider_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetValue",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSlider_SetValue",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6626,181 +6949,185 @@ static PyObject *_wrap_wxSlider_SetValue(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef controlscMethods[] = {
-	 { "wxSlider_SetValue", _wrap_wxSlider_SetValue, METH_VARARGS },
-	 { "wxSlider_SetTick", _wrap_wxSlider_SetTick, METH_VARARGS },
-	 { "wxSlider_SetThumbLength", _wrap_wxSlider_SetThumbLength, METH_VARARGS },
-	 { "wxSlider_SetSelection", _wrap_wxSlider_SetSelection, METH_VARARGS },
-	 { "wxSlider_SetPageSize", _wrap_wxSlider_SetPageSize, METH_VARARGS },
-	 { "wxSlider_SetLineSize", _wrap_wxSlider_SetLineSize, METH_VARARGS },
-	 { "wxSlider_SetTickFreq", _wrap_wxSlider_SetTickFreq, METH_VARARGS },
-	 { "wxSlider_SetRange", _wrap_wxSlider_SetRange, METH_VARARGS },
-	 { "wxSlider_GetValue", _wrap_wxSlider_GetValue, METH_VARARGS },
-	 { "wxSlider_GetTickFreq", _wrap_wxSlider_GetTickFreq, METH_VARARGS },
-	 { "wxSlider_GetThumbLength", _wrap_wxSlider_GetThumbLength, METH_VARARGS },
-	 { "wxSlider_GetSelStart", _wrap_wxSlider_GetSelStart, METH_VARARGS },
-	 { "wxSlider_GetSelEnd", _wrap_wxSlider_GetSelEnd, METH_VARARGS },
-	 { "wxSlider_GetPageSize", _wrap_wxSlider_GetPageSize, METH_VARARGS },
-	 { "wxSlider_GetMin", _wrap_wxSlider_GetMin, METH_VARARGS },
-	 { "wxSlider_GetMax", _wrap_wxSlider_GetMax, METH_VARARGS },
-	 { "wxSlider_GetLineSize", _wrap_wxSlider_GetLineSize, METH_VARARGS },
-	 { "wxSlider_ClearTicks", _wrap_wxSlider_ClearTicks, METH_VARARGS },
-	 { "wxSlider_ClearSel", _wrap_wxSlider_ClearSel, METH_VARARGS },
-	 { "new_wxSlider", _wrap_new_wxSlider, METH_VARARGS },
-	 { "wxRadioButton_SetValue", _wrap_wxRadioButton_SetValue, METH_VARARGS },
-	 { "wxRadioButton_GetValue", _wrap_wxRadioButton_GetValue, METH_VARARGS },
-	 { "new_wxRadioButton", _wrap_new_wxRadioButton, METH_VARARGS },
-	 { "wxRadioBox_ShowItem", _wrap_wxRadioBox_ShowItem, METH_VARARGS },
-	 { "wxRadioBox_Show", _wrap_wxRadioBox_Show, METH_VARARGS },
-	 { "wxRadioBox_SetStringSelection", _wrap_wxRadioBox_SetStringSelection, METH_VARARGS },
-	 { "wxRadioBox_SetSelection", _wrap_wxRadioBox_SetSelection, METH_VARARGS },
-	 { "wxRadioBox_SetItemLabel", _wrap_wxRadioBox_SetItemLabel, METH_VARARGS },
-	 { "wxRadioBox_Number", _wrap_wxRadioBox_Number, METH_VARARGS },
-	 { "wxRadioBox_GetStringSelection", _wrap_wxRadioBox_GetStringSelection, METH_VARARGS },
-	 { "wxRadioBox_GetString", _wrap_wxRadioBox_GetString, METH_VARARGS },
-	 { "wxRadioBox_GetSelection", _wrap_wxRadioBox_GetSelection, METH_VARARGS },
-	 { "wxRadioBox_GetItemLabel", _wrap_wxRadioBox_GetItemLabel, METH_VARARGS },
-	 { "wxRadioBox_FindString", _wrap_wxRadioBox_FindString, METH_VARARGS },
-	 { "wxRadioBox_EnableItem", _wrap_wxRadioBox_EnableItem, METH_VARARGS },
-	 { "wxRadioBox_Enable", _wrap_wxRadioBox_Enable, METH_VARARGS },
-	 { "new_wxRadioBox", _wrap_new_wxRadioBox, METH_VARARGS },
-	 { "wxStaticBitmap_SetIcon", _wrap_wxStaticBitmap_SetIcon, METH_VARARGS },
-	 { "wxStaticBitmap_SetBitmap", _wrap_wxStaticBitmap_SetBitmap, METH_VARARGS },
-	 { "wxStaticBitmap_GetBitmap", _wrap_wxStaticBitmap_GetBitmap, METH_VARARGS },
-	 { "new_wxStaticBitmap", _wrap_new_wxStaticBitmap, METH_VARARGS },
-	 { "wxSpinButton_SetValue", _wrap_wxSpinButton_SetValue, METH_VARARGS },
-	 { "wxSpinButton_SetRange", _wrap_wxSpinButton_SetRange, METH_VARARGS },
-	 { "wxSpinButton_GetValue", _wrap_wxSpinButton_GetValue, METH_VARARGS },
-	 { "wxSpinButton_GetMin", _wrap_wxSpinButton_GetMin, METH_VARARGS },
-	 { "wxSpinButton_GetMax", _wrap_wxSpinButton_GetMax, METH_VARARGS },
-	 { "new_wxSpinButton", _wrap_new_wxSpinButton, METH_VARARGS },
-	 { "wxScrollBar_SetScrollbar", _wrap_wxScrollBar_SetScrollbar, METH_VARARGS },
-	 { "wxScrollBar_SetThumbPosition", _wrap_wxScrollBar_SetThumbPosition, METH_VARARGS },
-	 { "wxScrollBar_GetThumbSize", _wrap_wxScrollBar_GetThumbSize, METH_VARARGS },
-	 { "wxScrollBar_GetThumbPosition", _wrap_wxScrollBar_GetThumbPosition, METH_VARARGS },
-	 { "wxScrollBar_GetPageSize", _wrap_wxScrollBar_GetPageSize, METH_VARARGS },
-	 { "wxScrollBar_GetRange", _wrap_wxScrollBar_GetRange, METH_VARARGS },
-	 { "new_wxScrollBar", _wrap_new_wxScrollBar, METH_VARARGS },
-	 { "wxTextCtrl_IsEditable", _wrap_wxTextCtrl_IsEditable, METH_VARARGS },
-	 { "wxTextCtrl_GetSelection", _wrap_wxTextCtrl_GetSelection, METH_VARARGS },
-	 { "wxTextCtrl_CanUndo", _wrap_wxTextCtrl_CanUndo, METH_VARARGS },
-	 { "wxTextCtrl_CanRedo", _wrap_wxTextCtrl_CanRedo, METH_VARARGS },
-	 { "wxTextCtrl_CanPaste", _wrap_wxTextCtrl_CanPaste, METH_VARARGS },
-	 { "wxTextCtrl_CanCut", _wrap_wxTextCtrl_CanCut, METH_VARARGS },
-	 { "wxTextCtrl_CanCopy", _wrap_wxTextCtrl_CanCopy, METH_VARARGS },
-	 { "wxTextCtrl_XYToPosition", _wrap_wxTextCtrl_XYToPosition, METH_VARARGS },
-	 { "wxTextCtrl_AppendText", _wrap_wxTextCtrl_AppendText, METH_VARARGS },
-	 { "wxTextCtrl_WriteText", _wrap_wxTextCtrl_WriteText, METH_VARARGS },
-	 { "wxTextCtrl_ShowPosition", _wrap_wxTextCtrl_ShowPosition, METH_VARARGS },
-	 { "wxTextCtrl_SetValue", _wrap_wxTextCtrl_SetValue, METH_VARARGS },
-	 { "wxTextCtrl_SetSelection", _wrap_wxTextCtrl_SetSelection, METH_VARARGS },
-	 { "wxTextCtrl_SetInsertionPointEnd", _wrap_wxTextCtrl_SetInsertionPointEnd, METH_VARARGS },
-	 { "wxTextCtrl_SetInsertionPoint", _wrap_wxTextCtrl_SetInsertionPoint, METH_VARARGS },
-	 { "wxTextCtrl_SetEditable", _wrap_wxTextCtrl_SetEditable, METH_VARARGS },
-	 { "wxTextCtrl_SaveFile", _wrap_wxTextCtrl_SaveFile, METH_VARARGS },
-	 { "wxTextCtrl_Replace", _wrap_wxTextCtrl_Replace, METH_VARARGS },
-	 { "wxTextCtrl_Remove", _wrap_wxTextCtrl_Remove, METH_VARARGS },
-	 { "wxTextCtrl_PositionToXY", _wrap_wxTextCtrl_PositionToXY, METH_VARARGS },
-	 { "wxTextCtrl_Paste", _wrap_wxTextCtrl_Paste, METH_VARARGS },
-	 { "wxTextCtrl_LoadFile", _wrap_wxTextCtrl_LoadFile, METH_VARARGS },
-	 { "wxTextCtrl_IsModified", _wrap_wxTextCtrl_IsModified, METH_VARARGS },
-	 { "wxTextCtrl_GetValue", _wrap_wxTextCtrl_GetValue, METH_VARARGS },
-	 { "wxTextCtrl_GetNumberOfLines", _wrap_wxTextCtrl_GetNumberOfLines, METH_VARARGS },
-	 { "wxTextCtrl_GetLineText", _wrap_wxTextCtrl_GetLineText, METH_VARARGS },
-	 { "wxTextCtrl_GetLineLength", _wrap_wxTextCtrl_GetLineLength, METH_VARARGS },
-	 { "wxTextCtrl_GetLastPosition", _wrap_wxTextCtrl_GetLastPosition, METH_VARARGS },
-	 { "wxTextCtrl_GetInsertionPoint", _wrap_wxTextCtrl_GetInsertionPoint, METH_VARARGS },
-	 { "wxTextCtrl_DiscardEdits", _wrap_wxTextCtrl_DiscardEdits, METH_VARARGS },
-	 { "wxTextCtrl_Cut", _wrap_wxTextCtrl_Cut, METH_VARARGS },
-	 { "wxTextCtrl_Copy", _wrap_wxTextCtrl_Copy, METH_VARARGS },
-	 { "wxTextCtrl_Clear", _wrap_wxTextCtrl_Clear, METH_VARARGS },
-	 { "new_wxTextCtrl", _wrap_new_wxTextCtrl, METH_VARARGS },
-	 { "wxCheckListBox_GetItemHeight", _wrap_wxCheckListBox_GetItemHeight, METH_VARARGS },
-	 { "wxCheckListBox_Check", _wrap_wxCheckListBox_Check, METH_VARARGS },
-	 { "wxCheckListBox_IsChecked", _wrap_wxCheckListBox_IsChecked, METH_VARARGS },
-	 { "new_wxCheckListBox", _wrap_new_wxCheckListBox, METH_VARARGS },
-	 { "wxListBox_SetStringSelection", _wrap_wxListBox_SetStringSelection, METH_VARARGS },
-	 { "wxListBox_SetString", _wrap_wxListBox_SetString, METH_VARARGS },
-	 { "wxListBox_SetSelection", _wrap_wxListBox_SetSelection, METH_VARARGS },
-	 { "wxListBox_SetFirstItemStr", _wrap_wxListBox_SetFirstItemStr, METH_VARARGS },
-	 { "wxListBox_SetFirstItem", _wrap_wxListBox_SetFirstItem, METH_VARARGS },
-	 { "wxListBox_Set", _wrap_wxListBox_Set, METH_VARARGS },
-	 { "wxListBox_Selected", _wrap_wxListBox_Selected, METH_VARARGS },
-	 { "wxListBox_Number", _wrap_wxListBox_Number, METH_VARARGS },
-	 { "wxListBox_GetStringSelection", _wrap_wxListBox_GetStringSelection, METH_VARARGS },
-	 { "wxListBox_GetString", _wrap_wxListBox_GetString, METH_VARARGS },
-	 { "wxListBox_GetSelections", _wrap_wxListBox_GetSelections, METH_VARARGS },
-	 { "wxListBox_GetSelection", _wrap_wxListBox_GetSelection, METH_VARARGS },
-	 { "wxListBox_FindString", _wrap_wxListBox_FindString, METH_VARARGS },
-	 { "wxListBox_Deselect", _wrap_wxListBox_Deselect, METH_VARARGS },
-	 { "wxListBox_Delete", _wrap_wxListBox_Delete, METH_VARARGS },
-	 { "wxListBox_Clear", _wrap_wxListBox_Clear, METH_VARARGS },
-	 { "wxListBox_Append", _wrap_wxListBox_Append, METH_VARARGS },
-	 { "new_wxListBox", _wrap_new_wxListBox, METH_VARARGS },
-	 { "wxStaticText_SetLabel", _wrap_wxStaticText_SetLabel, METH_VARARGS },
-	 { "wxStaticText_GetLabel", _wrap_wxStaticText_GetLabel, METH_VARARGS },
-	 { "new_wxStaticText", _wrap_new_wxStaticText, METH_VARARGS },
-	 { "new_wxStaticLine", _wrap_new_wxStaticLine, METH_VARARGS },
-	 { "new_wxStaticBox", _wrap_new_wxStaticBox, METH_VARARGS },
-	 { "wxGauge_SetValue", _wrap_wxGauge_SetValue, METH_VARARGS },
-	 { "wxGauge_SetShadowWidth", _wrap_wxGauge_SetShadowWidth, METH_VARARGS },
-	 { "wxGauge_SetRange", _wrap_wxGauge_SetRange, METH_VARARGS },
-	 { "wxGauge_SetBezelFace", _wrap_wxGauge_SetBezelFace, METH_VARARGS },
-	 { "wxGauge_GetValue", _wrap_wxGauge_GetValue, METH_VARARGS },
-	 { "wxGauge_GetShadowWidth", _wrap_wxGauge_GetShadowWidth, METH_VARARGS },
-	 { "wxGauge_GetRange", _wrap_wxGauge_GetRange, METH_VARARGS },
-	 { "wxGauge_GetBezelFace", _wrap_wxGauge_GetBezelFace, METH_VARARGS },
-	 { "new_wxGauge", _wrap_new_wxGauge, METH_VARARGS },
-	 { "wxComboBox_SetValue", _wrap_wxComboBox_SetValue, METH_VARARGS },
-	 { "wxComboBox_SetMark", _wrap_wxComboBox_SetMark, METH_VARARGS },
-	 { "wxComboBox_SetSelection", _wrap_wxComboBox_SetSelection, METH_VARARGS },
-	 { "wxComboBox_SetInsertionPointEnd", _wrap_wxComboBox_SetInsertionPointEnd, METH_VARARGS },
-	 { "wxComboBox_SetInsertionPoint", _wrap_wxComboBox_SetInsertionPoint, METH_VARARGS },
-	 { "wxComboBox_Remove", _wrap_wxComboBox_Remove, METH_VARARGS },
-	 { "wxComboBox_Replace", _wrap_wxComboBox_Replace, METH_VARARGS },
-	 { "wxComboBox_Paste", _wrap_wxComboBox_Paste, METH_VARARGS },
-	 { "wxComboBox_Number", _wrap_wxComboBox_Number, METH_VARARGS },
-	 { "wxComboBox_GetValue", _wrap_wxComboBox_GetValue, METH_VARARGS },
-	 { "wxComboBox_GetStringSelection", _wrap_wxComboBox_GetStringSelection, METH_VARARGS },
-	 { "wxComboBox_GetString", _wrap_wxComboBox_GetString, METH_VARARGS },
-	 { "wxComboBox_GetSelection", _wrap_wxComboBox_GetSelection, METH_VARARGS },
-	 { "wxComboBox_GetLastPosition", _wrap_wxComboBox_GetLastPosition, METH_VARARGS },
-	 { "wxComboBox_GetInsertionPoint", _wrap_wxComboBox_GetInsertionPoint, METH_VARARGS },
-	 { "wxComboBox_FindString", _wrap_wxComboBox_FindString, METH_VARARGS },
-	 { "wxComboBox_Delete", _wrap_wxComboBox_Delete, METH_VARARGS },
-	 { "wxComboBox_Cut", _wrap_wxComboBox_Cut, METH_VARARGS },
-	 { "wxComboBox_Copy", _wrap_wxComboBox_Copy, METH_VARARGS },
-	 { "wxComboBox_Clear", _wrap_wxComboBox_Clear, METH_VARARGS },
-	 { "wxComboBox_Append", _wrap_wxComboBox_Append, METH_VARARGS },
-	 { "new_wxComboBox", _wrap_new_wxComboBox, METH_VARARGS },
-	 { "wxChoice_SetStringSelection", _wrap_wxChoice_SetStringSelection, METH_VARARGS },
-	 { "wxChoice_SetSelection", _wrap_wxChoice_SetSelection, METH_VARARGS },
-	 { "wxChoice_SetColumns", _wrap_wxChoice_SetColumns, METH_VARARGS },
-	 { "wxChoice_Number", _wrap_wxChoice_Number, METH_VARARGS },
-	 { "wxChoice_GetStringSelection", _wrap_wxChoice_GetStringSelection, METH_VARARGS },
-	 { "wxChoice_GetString", _wrap_wxChoice_GetString, METH_VARARGS },
-	 { "wxChoice_GetSelection", _wrap_wxChoice_GetSelection, METH_VARARGS },
-	 { "wxChoice_GetColumns", _wrap_wxChoice_GetColumns, METH_VARARGS },
-	 { "wxChoice_FindString", _wrap_wxChoice_FindString, METH_VARARGS },
-	 { "wxChoice_Clear", _wrap_wxChoice_Clear, METH_VARARGS },
-	 { "wxChoice_Append", _wrap_wxChoice_Append, METH_VARARGS },
-	 { "new_wxChoice", _wrap_new_wxChoice, METH_VARARGS },
-	 { "wxCheckBox_SetValue", _wrap_wxCheckBox_SetValue, METH_VARARGS },
-	 { "wxCheckBox_GetValue", _wrap_wxCheckBox_GetValue, METH_VARARGS },
-	 { "new_wxCheckBox", _wrap_new_wxCheckBox, METH_VARARGS },
-	 { "wxBitmapButton_SetBitmapLabel", _wrap_wxBitmapButton_SetBitmapLabel, METH_VARARGS },
-	 { "wxBitmapButton_SetBitmapSelected", _wrap_wxBitmapButton_SetBitmapSelected, METH_VARARGS },
-	 { "wxBitmapButton_SetBitmapFocus", _wrap_wxBitmapButton_SetBitmapFocus, METH_VARARGS },
-	 { "wxBitmapButton_SetBitmapDisabled", _wrap_wxBitmapButton_SetBitmapDisabled, METH_VARARGS },
-	 { "wxBitmapButton_GetBitmapSelected", _wrap_wxBitmapButton_GetBitmapSelected, METH_VARARGS },
-	 { "wxBitmapButton_GetBitmapFocus", _wrap_wxBitmapButton_GetBitmapFocus, METH_VARARGS },
-	 { "wxBitmapButton_GetBitmapDisabled", _wrap_wxBitmapButton_GetBitmapDisabled, METH_VARARGS },
-	 { "wxBitmapButton_GetBitmapLabel", _wrap_wxBitmapButton_GetBitmapLabel, METH_VARARGS },
-	 { "new_wxBitmapButton", _wrap_new_wxBitmapButton, METH_VARARGS },
-	 { "wxButton_SetDefault", _wrap_wxButton_SetDefault, METH_VARARGS },
-	 { "new_wxButton", _wrap_new_wxButton, METH_VARARGS },
-	 { "wxControl_SetLabel", _wrap_wxControl_SetLabel, METH_VARARGS },
-	 { "wxControl_GetLabel", _wrap_wxControl_GetLabel, METH_VARARGS },
-	 { "wxControl_Command", _wrap_wxControl_Command, METH_VARARGS },
+	 { "wxSlider_SetValue", (PyCFunction) _wrap_wxSlider_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetTick", (PyCFunction) _wrap_wxSlider_SetTick, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetThumbLength", (PyCFunction) _wrap_wxSlider_SetThumbLength, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetSelection", (PyCFunction) _wrap_wxSlider_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetPageSize", (PyCFunction) _wrap_wxSlider_SetPageSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetLineSize", (PyCFunction) _wrap_wxSlider_SetLineSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetTickFreq", (PyCFunction) _wrap_wxSlider_SetTickFreq, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetRange", (PyCFunction) _wrap_wxSlider_SetRange, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetValue", (PyCFunction) _wrap_wxSlider_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetTickFreq", (PyCFunction) _wrap_wxSlider_GetTickFreq, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetThumbLength", (PyCFunction) _wrap_wxSlider_GetThumbLength, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetSelStart", (PyCFunction) _wrap_wxSlider_GetSelStart, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetSelEnd", (PyCFunction) _wrap_wxSlider_GetSelEnd, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetPageSize", (PyCFunction) _wrap_wxSlider_GetPageSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetMin", (PyCFunction) _wrap_wxSlider_GetMin, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetMax", (PyCFunction) _wrap_wxSlider_GetMax, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetLineSize", (PyCFunction) _wrap_wxSlider_GetLineSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_ClearTicks", (PyCFunction) _wrap_wxSlider_ClearTicks, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_ClearSel", (PyCFunction) _wrap_wxSlider_ClearSel, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxSlider", (PyCFunction) _wrap_new_wxSlider, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioButton_SetValue", (PyCFunction) _wrap_wxRadioButton_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioButton_GetValue", (PyCFunction) _wrap_wxRadioButton_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxRadioButton", (PyCFunction) _wrap_new_wxRadioButton, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_ShowItem", (PyCFunction) _wrap_wxRadioBox_ShowItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_Show", (PyCFunction) _wrap_wxRadioBox_Show, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_SetStringSelection", (PyCFunction) _wrap_wxRadioBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_SetSelection", (PyCFunction) _wrap_wxRadioBox_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_SetItemLabel", (PyCFunction) _wrap_wxRadioBox_SetItemLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_Number", (PyCFunction) _wrap_wxRadioBox_Number, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_GetStringSelection", (PyCFunction) _wrap_wxRadioBox_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_GetString", (PyCFunction) _wrap_wxRadioBox_GetString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_GetSelection", (PyCFunction) _wrap_wxRadioBox_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_GetItemLabel", (PyCFunction) _wrap_wxRadioBox_GetItemLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_FindString", (PyCFunction) _wrap_wxRadioBox_FindString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_EnableItem", (PyCFunction) _wrap_wxRadioBox_EnableItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_Enable", (PyCFunction) _wrap_wxRadioBox_Enable, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxRadioBox", (PyCFunction) _wrap_new_wxRadioBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStaticBitmap_SetIcon", (PyCFunction) _wrap_wxStaticBitmap_SetIcon, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStaticBitmap_SetBitmap", (PyCFunction) _wrap_wxStaticBitmap_SetBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStaticBitmap_GetBitmap", (PyCFunction) _wrap_wxStaticBitmap_GetBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxStaticBitmap", (PyCFunction) _wrap_new_wxStaticBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSpinButton_SetValue", (PyCFunction) _wrap_wxSpinButton_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSpinButton_SetRange", (PyCFunction) _wrap_wxSpinButton_SetRange, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSpinButton_GetValue", (PyCFunction) _wrap_wxSpinButton_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSpinButton_GetMin", (PyCFunction) _wrap_wxSpinButton_GetMin, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSpinButton_GetMax", (PyCFunction) _wrap_wxSpinButton_GetMax, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxSpinButton", (PyCFunction) _wrap_new_wxSpinButton, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollBar_SetScrollbar", (PyCFunction) _wrap_wxScrollBar_SetScrollbar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollBar_SetThumbPosition", (PyCFunction) _wrap_wxScrollBar_SetThumbPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollBar_GetThumbSize", (PyCFunction) _wrap_wxScrollBar_GetThumbSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollBar_GetThumbPosition", (PyCFunction) _wrap_wxScrollBar_GetThumbPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollBar_GetPageSize", (PyCFunction) _wrap_wxScrollBar_GetPageSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollBar_GetRange", (PyCFunction) _wrap_wxScrollBar_GetRange, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxScrollBar", (PyCFunction) _wrap_new_wxScrollBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_write", (PyCFunction) _wrap_wxTextCtrl_write, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Redo", (PyCFunction) _wrap_wxTextCtrl_Redo, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Undo", (PyCFunction) _wrap_wxTextCtrl_Undo, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_IsEditable", (PyCFunction) _wrap_wxTextCtrl_IsEditable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetSelection", (PyCFunction) _wrap_wxTextCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_CanUndo", (PyCFunction) _wrap_wxTextCtrl_CanUndo, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_CanRedo", (PyCFunction) _wrap_wxTextCtrl_CanRedo, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_CanPaste", (PyCFunction) _wrap_wxTextCtrl_CanPaste, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_CanCut", (PyCFunction) _wrap_wxTextCtrl_CanCut, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_CanCopy", (PyCFunction) _wrap_wxTextCtrl_CanCopy, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_XYToPosition", (PyCFunction) _wrap_wxTextCtrl_XYToPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_AppendText", (PyCFunction) _wrap_wxTextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_WriteText", (PyCFunction) _wrap_wxTextCtrl_WriteText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_ShowPosition", (PyCFunction) _wrap_wxTextCtrl_ShowPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_SetValue", (PyCFunction) _wrap_wxTextCtrl_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_SetSelection", (PyCFunction) _wrap_wxTextCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_SetInsertionPointEnd", (PyCFunction) _wrap_wxTextCtrl_SetInsertionPointEnd, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_SetInsertionPoint", (PyCFunction) _wrap_wxTextCtrl_SetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_SetEditable", (PyCFunction) _wrap_wxTextCtrl_SetEditable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_SaveFile", (PyCFunction) _wrap_wxTextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Replace", (PyCFunction) _wrap_wxTextCtrl_Replace, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Remove", (PyCFunction) _wrap_wxTextCtrl_Remove, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_PositionToXY", (PyCFunction) _wrap_wxTextCtrl_PositionToXY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Paste", (PyCFunction) _wrap_wxTextCtrl_Paste, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_LoadFile", (PyCFunction) _wrap_wxTextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_IsModified", (PyCFunction) _wrap_wxTextCtrl_IsModified, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetValue", (PyCFunction) _wrap_wxTextCtrl_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetNumberOfLines", (PyCFunction) _wrap_wxTextCtrl_GetNumberOfLines, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetLineText", (PyCFunction) _wrap_wxTextCtrl_GetLineText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetLineLength", (PyCFunction) _wrap_wxTextCtrl_GetLineLength, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetLastPosition", (PyCFunction) _wrap_wxTextCtrl_GetLastPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetInsertionPoint", (PyCFunction) _wrap_wxTextCtrl_GetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_DiscardEdits", (PyCFunction) _wrap_wxTextCtrl_DiscardEdits, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Cut", (PyCFunction) _wrap_wxTextCtrl_Cut, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Copy", (PyCFunction) _wrap_wxTextCtrl_Copy, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Clear", (PyCFunction) _wrap_wxTextCtrl_Clear, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxTextCtrl", (PyCFunction) _wrap_new_wxTextCtrl, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCheckListBox_GetItemHeight", (PyCFunction) _wrap_wxCheckListBox_GetItemHeight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCheckListBox_Check", (PyCFunction) _wrap_wxCheckListBox_Check, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCheckListBox_IsChecked", (PyCFunction) _wrap_wxCheckListBox_IsChecked, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxCheckListBox", (PyCFunction) _wrap_new_wxCheckListBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_SetStringSelection", (PyCFunction) _wrap_wxListBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_SetString", (PyCFunction) _wrap_wxListBox_SetString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_SetSelection", (PyCFunction) _wrap_wxListBox_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_SetFirstItemStr", (PyCFunction) _wrap_wxListBox_SetFirstItemStr, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_SetFirstItem", (PyCFunction) _wrap_wxListBox_SetFirstItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Set", (PyCFunction) _wrap_wxListBox_Set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Selected", (PyCFunction) _wrap_wxListBox_Selected, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Number", (PyCFunction) _wrap_wxListBox_Number, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_GetStringSelection", (PyCFunction) _wrap_wxListBox_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_GetString", (PyCFunction) _wrap_wxListBox_GetString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_InsertItems", (PyCFunction) _wrap_wxListBox_InsertItems, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_GetSelections", (PyCFunction) _wrap_wxListBox_GetSelections, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_GetSelection", (PyCFunction) _wrap_wxListBox_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_FindString", (PyCFunction) _wrap_wxListBox_FindString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Deselect", (PyCFunction) _wrap_wxListBox_Deselect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Delete", (PyCFunction) _wrap_wxListBox_Delete, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Clear", (PyCFunction) _wrap_wxListBox_Clear, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Append", (PyCFunction) _wrap_wxListBox_Append, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxListBox", (PyCFunction) _wrap_new_wxListBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStaticText_SetLabel", (PyCFunction) _wrap_wxStaticText_SetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStaticText_GetLabel", (PyCFunction) _wrap_wxStaticText_GetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxStaticText", (PyCFunction) _wrap_new_wxStaticText, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxStaticLine", (PyCFunction) _wrap_new_wxStaticLine, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxStaticBox", (PyCFunction) _wrap_new_wxStaticBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_SetValue", (PyCFunction) _wrap_wxGauge_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_SetShadowWidth", (PyCFunction) _wrap_wxGauge_SetShadowWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_SetRange", (PyCFunction) _wrap_wxGauge_SetRange, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_SetBezelFace", (PyCFunction) _wrap_wxGauge_SetBezelFace, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_GetValue", (PyCFunction) _wrap_wxGauge_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_GetShadowWidth", (PyCFunction) _wrap_wxGauge_GetShadowWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_GetRange", (PyCFunction) _wrap_wxGauge_GetRange, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_GetBezelFace", (PyCFunction) _wrap_wxGauge_GetBezelFace, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxGauge", (PyCFunction) _wrap_new_wxGauge, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_SetValue", (PyCFunction) _wrap_wxComboBox_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_SetMark", (PyCFunction) _wrap_wxComboBox_SetMark, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_SetSelection", (PyCFunction) _wrap_wxComboBox_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_SetInsertionPointEnd", (PyCFunction) _wrap_wxComboBox_SetInsertionPointEnd, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_SetInsertionPoint", (PyCFunction) _wrap_wxComboBox_SetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Remove", (PyCFunction) _wrap_wxComboBox_Remove, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Replace", (PyCFunction) _wrap_wxComboBox_Replace, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Paste", (PyCFunction) _wrap_wxComboBox_Paste, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Number", (PyCFunction) _wrap_wxComboBox_Number, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_GetValue", (PyCFunction) _wrap_wxComboBox_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_GetStringSelection", (PyCFunction) _wrap_wxComboBox_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_GetString", (PyCFunction) _wrap_wxComboBox_GetString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_GetSelection", (PyCFunction) _wrap_wxComboBox_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_GetLastPosition", (PyCFunction) _wrap_wxComboBox_GetLastPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_GetInsertionPoint", (PyCFunction) _wrap_wxComboBox_GetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_FindString", (PyCFunction) _wrap_wxComboBox_FindString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Delete", (PyCFunction) _wrap_wxComboBox_Delete, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Cut", (PyCFunction) _wrap_wxComboBox_Cut, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Copy", (PyCFunction) _wrap_wxComboBox_Copy, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Clear", (PyCFunction) _wrap_wxComboBox_Clear, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Append", (PyCFunction) _wrap_wxComboBox_Append, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxComboBox", (PyCFunction) _wrap_new_wxComboBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_SetStringSelection", (PyCFunction) _wrap_wxChoice_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_SetSelection", (PyCFunction) _wrap_wxChoice_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_SetColumns", (PyCFunction) _wrap_wxChoice_SetColumns, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_Number", (PyCFunction) _wrap_wxChoice_Number, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_GetStringSelection", (PyCFunction) _wrap_wxChoice_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_GetString", (PyCFunction) _wrap_wxChoice_GetString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_GetSelection", (PyCFunction) _wrap_wxChoice_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_GetColumns", (PyCFunction) _wrap_wxChoice_GetColumns, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_FindString", (PyCFunction) _wrap_wxChoice_FindString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_Clear", (PyCFunction) _wrap_wxChoice_Clear, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_Append", (PyCFunction) _wrap_wxChoice_Append, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxChoice", (PyCFunction) _wrap_new_wxChoice, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCheckBox_SetValue", (PyCFunction) _wrap_wxCheckBox_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCheckBox_GetValue", (PyCFunction) _wrap_wxCheckBox_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxCheckBox", (PyCFunction) _wrap_new_wxCheckBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_SetBitmapLabel", (PyCFunction) _wrap_wxBitmapButton_SetBitmapLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_SetBitmapSelected", (PyCFunction) _wrap_wxBitmapButton_SetBitmapSelected, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_SetBitmapFocus", (PyCFunction) _wrap_wxBitmapButton_SetBitmapFocus, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_SetBitmapDisabled", (PyCFunction) _wrap_wxBitmapButton_SetBitmapDisabled, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_GetBitmapSelected", (PyCFunction) _wrap_wxBitmapButton_GetBitmapSelected, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_GetBitmapFocus", (PyCFunction) _wrap_wxBitmapButton_GetBitmapFocus, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_GetBitmapDisabled", (PyCFunction) _wrap_wxBitmapButton_GetBitmapDisabled, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_GetBitmapLabel", (PyCFunction) _wrap_wxBitmapButton_GetBitmapLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxBitmapButton", (PyCFunction) _wrap_new_wxBitmapButton, METH_VARARGS | METH_KEYWORDS },
+	 { "wxButton_SetDefault", (PyCFunction) _wrap_wxButton_SetDefault, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxButton", (PyCFunction) _wrap_new_wxButton, METH_VARARGS | METH_KEYWORDS },
+	 { "wxControl_SetLabel", (PyCFunction) _wrap_wxControl_SetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxControl_GetLabel", (PyCFunction) _wrap_wxControl_GetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxControl_Command", (PyCFunction) _wrap_wxControl_Command, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
@@ -6815,6 +7142,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxActivateEvent","_wxActivateEvent",0},
     { "_signed_long","_long",0},
     { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0},
+    { "_wxBitmapDataObject","_class_wxBitmapDataObject",0},
+    { "_class_wxPyCommandEvent","_wxPyCommandEvent",0},
+    { "_wxPrintQuality","_wxCoord",0},
     { "_wxPrintQuality","_int",0},
     { "_wxPrintQuality","_signed_int",0},
     { "_wxPrintQuality","_unsigned_int",0},
@@ -6822,7 +7153,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxPrintQuality","_uint",0},
     { "_wxPrintQuality","_EBool",0},
     { "_wxPrintQuality","_size_t",0},
+    { "_class_wxCustomDataObject","_wxCustomDataObject",0},
     { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0},
     { "_class_wxMenuBar","_wxMenuBar",0},
     { "_class_wxEvtHandler","_class_wxSlider",SwigwxSliderTowxEvtHandler},
     { "_class_wxEvtHandler","_wxSlider",SwigwxSliderTowxEvtHandler},
@@ -6871,7 +7204,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxPen","_class_wxPen",0},
     { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
     { "_byte","_unsigned_char",0},
+    { "_wxDataObject","_class_wxDataObject",0},
     { "_wxStaticBox","_class_wxStaticBox",0},
+    { "_wxPyDataObjectSimple","_class_wxPyDataObjectSimple",0},
+    { "_wxPyDropSource","_class_wxPyDropSource",0},
     { "_wxChoice","_class_wxComboBox",SwigwxComboBoxTowxChoice},
     { "_wxChoice","_wxComboBox",SwigwxComboBoxTowxChoice},
     { "_wxChoice","_class_wxChoice",0},
@@ -6880,19 +7216,25 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_long","_unsigned_long",0},
     { "_long","_signed_long",0},
     { "_wxImageList","_class_wxImageList",0},
+    { "_wxDataObjectSimple","_class_wxDataObjectSimple",0},
     { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
     { "_wxBitmapButton","_class_wxBitmapButton",0},
     { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_class_wxClipboard","_wxClipboard",0},
     { "_class_wxGauge","_wxGauge",0},
     { "_wxDC","_class_wxDC",0},
+    { "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
     { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_size_t","_wxCoord",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},
+    { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
     { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
     { "_class_wxMenuItem","_wxMenuItem",0},
     { "_class_wxPaintEvent","_wxPaintEvent",0},
     { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
@@ -6902,19 +7244,26 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxPyEvent","_class_wxPyEvent",0},
     { "_wxTextCtrl","_class_wxTextCtrl",0},
     { "_class_wxMask","_wxMask",0},
+    { "_wxTextDataObject","_class_wxTextDataObject",0},
     { "_class_wxKeyEvent","_wxKeyEvent",0},
     { "_wxColour","_class_wxColour",0},
     { "_class_wxDialog","_wxDialog",0},
+    { "_class_wxFileDataObject","_wxFileDataObject",0},
     { "_wxIdleEvent","_class_wxIdleEvent",0},
     { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_class_wxDataObject","_wxDataObject",0},
     { "_wxStaticLine","_class_wxStaticLine",0},
     { "_wxBrush","_class_wxBrush",0},
+    { "_wxDataFormat","_class_wxDataFormat",0},
+    { "_class_wxDataObjectSimple","_wxDataObjectSimple",0},
     { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_uint","_wxCoord",0},
     { "_uint","_wxPrintQuality",0},
     { "_uint","_size_t",0},
     { "_uint","_unsigned_int",0},
     { "_uint","_int",0},
     { "_uint","_wxWindowID",0},
+    { "_wxPyValidator","_class_wxPyValidator",0},
     { "_class_wxEvent","_wxEvent",0},
     { "_wxCheckListBox","_class_wxCheckListBox",0},
     { "_wxRect","_class_wxRect",0},
@@ -6932,24 +7281,33 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxSpinButton","_class_wxSpinButton",0},
     { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
     { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_class_wxValidator","_wxValidator",0},
     { "_class_wxPyEvent","_wxPyEvent",0},
     { "_class_wxIconizeEvent","_wxIconizeEvent",0},
     { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_wxDropTarget","_class_wxDropTarget",0},
     { "_class_wxStaticLine","_wxStaticLine",0},
     { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_EBool","_wxCoord",0},
     { "_EBool","_wxPrintQuality",0},
     { "_EBool","_signed_int",0},
     { "_EBool","_int",0},
     { "_EBool","_wxWindowID",0},
     { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDataFormat","_wxDataFormat",0},
     { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0},
     { "_wxStaticText","_class_wxStaticText",0},
     { "_wxFont","_class_wxFont",0},
+    { "_class_wxPyDropTarget","_wxPyDropTarget",0},
     { "_wxCloseEvent","_class_wxCloseEvent",0},
     { "_unsigned_long","_wxDash",0},
     { "_unsigned_long","_long",0},
     { "_class_wxRect","_wxRect",0},
     { "_class_wxDC","_wxDC",0},
+    { "_wxScrollWinEvent","_class_wxScrollWinEvent",0},
+    { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0},
+    { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0},
     { "_class_wxPyTimer","_wxPyTimer",0},
     { "_wxFocusEvent","_class_wxFocusEvent",0},
     { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
@@ -6959,6 +7317,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxCheckBox","_wxCheckBox",0},
     { "_wxComboBox","_class_wxComboBox",0},
     { "_wxRadioButton","_class_wxRadioButton",0},
+    { "_signed_int","_wxCoord",0},
     { "_signed_int","_wxPrintQuality",0},
     { "_signed_int","_EBool",0},
     { "_signed_int","_wxWindowID",0},
@@ -6966,6 +7325,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxTextCtrl","_wxTextCtrl",0},
     { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
     { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_class_wxTextDataObject","_wxTextDataObject",0},
     { "_wxMenu","_class_wxMenu",0},
     { "_class_wxMoveEvent","_wxMoveEvent",0},
     { "_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox},
@@ -6975,6 +7335,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_WXTYPE","_short",0},
     { "_WXTYPE","_signed_short",0},
     { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxDropTarget","_wxDropTarget",0},
     { "_class_wxBrush","_wxBrush",0},
     { "_unsigned_short","_WXTYPE",0},
     { "_unsigned_short","_short",0},
@@ -7019,8 +7380,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxWindow","_wxWindow",0},
     { "_class_wxStaticText","_wxStaticText",0},
     { "_class_wxFont","_wxFont",0},
+    { "_wxClipboard","_class_wxClipboard",0},
+    { "_class_wxPyValidator","_wxPyValidator",0},
     { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_wxBusyInfo","_class_wxBusyInfo",0},
     { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},
+    { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
     { "_wxClientDC","_class_wxClientDC",0},
     { "_wxMouseEvent","_class_wxMouseEvent",0},
     { "_class_wxPoint","_wxPoint",0},
@@ -7029,12 +7395,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_signed_short","_WXTYPE",0},
     { "_signed_short","_short",0},
     { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPyTextDataObject","_class_wxPyTextDataObject",0},
     { "_wxPaintDC","_class_wxPaintDC",0},
     { "_class_wxWindowDC","_wxWindowDC",0},
     { "_class_wxFocusEvent","_wxFocusEvent",0},
     { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_class_wxCursor","_wxCursor",0},
+    { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
     { "_wxScrolledWindow","_class_wxScrolledWindow",0},
     { "_unsigned_char","_byte",0},
     { "_class_wxMetaFileDC","_wxMetaFileDC",0},
@@ -7079,6 +7447,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox},
     { "_class_wxListBox","_wxCheckListBox",SwigwxCheckListBoxTowxListBox},
     { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_wxCoord",0},
     { "_unsigned_int","_wxPrintQuality",0},
     { "_unsigned_int","_size_t",0},
     { "_unsigned_int","_uint",0},
@@ -7091,6 +7460,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_short","_unsigned_short",0},
     { "_short","_signed_short",0},
     { "_class_wxStaticBox","_wxStaticBox",0},
+    { "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0},
+    { "_class_wxPyDropSource","_wxPyDropSource",0},
     { "_class_wxScrollEvent","_wxScrollEvent",0},
     { "_wxJoystickEvent","_class_wxJoystickEvent",0},
     { "_class_wxChoice","_class_wxComboBox",SwigwxComboBoxTowxChoice},
@@ -7099,6 +7470,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxSlider","_wxSlider",0},
     { "_class_wxImageList","_wxImageList",0},
     { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
+    { "_wxWindowID","_wxCoord",0},
     { "_wxWindowID","_wxPrintQuality",0},
     { "_wxWindowID","_size_t",0},
     { "_wxWindowID","_EBool",0},
@@ -7106,6 +7479,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxWindowID","_int",0},
     { "_wxWindowID","_signed_int",0},
     { "_wxWindowID","_unsigned_int",0},
+    { "_class_wxScrollWinEvent","_wxScrollWinEvent",0},
+    { "_int","_wxCoord",0},
     { "_int","_wxPrintQuality",0},
     { "_int","_size_t",0},
     { "_int","_EBool",0},
@@ -7114,18 +7489,24 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_int","_unsigned_int",0},
     { "_int","_signed_int",0},
     { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_wxPyCommandEvent","_class_wxPyCommandEvent",0},
     { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0},
+    { "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0},
     { "_wxButton","_class_wxBitmapButton",SwigwxBitmapButtonTowxButton},
     { "_wxButton","_wxBitmapButton",SwigwxBitmapButtonTowxButton},
     { "_wxButton","_class_wxButton",0},
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",0},
     { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
     { "_class_wxPaintDC","_wxPaintDC",0},
     { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0},
     { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
     { "_class_wxComboBox","_wxComboBox",0},
     { "_class_wxRadioButton","_wxRadioButton",0},
+    { "_wxValidator","_class_wxValidator",0},
     { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
     { "_wxIconizeEvent","_class_wxIconizeEvent",0},
     { "_class_wxControl","_class_wxSlider",SwigwxSliderTowxControl},
@@ -7171,19 +7552,32 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxScreenDC","_wxScreenDC",0},
     { "_wxPalette","_class_wxPalette",0},
     { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxCoord","_int",0},
+    { "_wxCoord","_signed_int",0},
+    { "_wxCoord","_unsigned_int",0},
+    { "_wxCoord","_wxWindowID",0},
+    { "_wxCoord","_uint",0},
+    { "_wxCoord","_EBool",0},
+    { "_wxCoord","_size_t",0},
+    { "_wxCoord","_wxPrintQuality",0},
     { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_wxDataObjectComposite","_class_wxDataObjectComposite",0},
     { "_class_wxJoystickEvent","_wxJoystickEvent",0},
     { "_wxRegion","_class_wxRegion",0},
     { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_wxPyDropTarget","_class_wxPyDropTarget",0},
     { "_wxActivateEvent","_class_wxActivateEvent",0},
     { "_wxGauge","_class_wxGauge",0},
     { "_class_wxCheckListBox","_wxCheckListBox",0},
+    { "_class_wxBusyInfo","_wxBusyInfo",0},
     { "_class_wxCommandEvent","_wxCommandEvent",0},
     { "_class_wxClientDC","_wxClientDC",0},
     { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_wxCustomDataObject","_class_wxCustomDataObject",0},
     { "_class_wxSize","_wxSize",0},
     { "_class_wxBitmap","_wxBitmap",0},
     { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0},
     { "_wxMenuBar","_class_wxMenuBar",0},
     { "_wxEvtHandler","_class_wxSlider",SwigwxSliderTowxEvtHandler},
     { "_wxEvtHandler","_wxSlider",SwigwxSliderTowxEvtHandler},
@@ -7232,7 +7626,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxKeyEvent","_class_wxKeyEvent",0},
     { "_wxMoveEvent","_class_wxMoveEvent",0},
     { "_class_wxPalette","_wxPalette",0},
+    { "_wxFileDataObject","_class_wxFileDataObject",0},
     { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
     { "_wxWindow","_class_wxSlider",SwigwxSliderTowxWindow},
     { "_wxWindow","_wxSlider",SwigwxSliderTowxWindow},
     { "_wxWindow","_class_wxRadioButton",SwigwxRadioButtonTowxWindow},
@@ -7272,6 +7668,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxWindow","_class_wxControl",SwigwxControlTowxWindow},
     { "_wxWindow","_wxControl",SwigwxControlTowxWindow},
     { "_wxWindow","_class_wxWindow",0},
+    { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0},
 {0,0,0}};
 
 static PyObject *SWIG_globals;
@@ -7283,6 +7680,8 @@ SWIGEXPORT(void) initcontrolsc() {
 	 SWIG_globals = SWIG_newvarlink();
 	 m = Py_InitModule("controlsc", controlscMethods);
 	 d = PyModule_GetDict(m);
+	 PyDict_SetItemString(d,"cvar", SWIG_globals);
+	 SWIG_addvarlink(SWIG_globals,"wxDefaultValidator",_wrap_wxDefaultValidator_get, _wrap_wxDefaultValidator_set);
 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)