more tweaks for release

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

diff --git a/utils/wxPython/src/msw/cmndlgs.cpp b/utils/wxPython/src/msw/cmndlgs.cpp
index c7ab22e788b0ef350440b4a0ef7f07217dbf1249..d3e57c7ef7b066516a3ddd838ac2f2373bbd8b0b 100644 (file)
--- a/utils/wxPython/src/msw/cmndlgs.cpp
+++ b/utils/wxPython/src/msw/cmndlgs.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.
@@ -106,29 +106,19 @@ 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";
 #ifdef __cplusplus
 extern "C" {
 #endif
 #define new_wxColourData() (new wxColourData())
-static PyObject *_wrap_new_wxColourData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxColourData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourData * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxColourData")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxColourData",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -146,13 +136,14 @@ static PyObject *_wrap_new_wxColourData(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxColourData(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxColourData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxColourData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxColourData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxColourData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -172,14 +163,15 @@ static PyObject *_wrap_delete_wxColourData(PyObject *self, PyObject *args) {
 }
 
 #define wxColourData_GetChooseFull(_swigobj)  (_swigobj->GetChooseFull())
-static PyObject *_wrap_wxColourData_GetChooseFull(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourData_GetChooseFull(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxColourData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxColourData_GetChooseFull",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColourData_GetChooseFull",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -198,15 +190,16 @@ static PyObject *_wrap_wxColourData_GetChooseFull(PyObject *self, PyObject *args
 }
 
 #define wxColourData_GetColour(_swigobj)  (_swigobj->GetColour())
-static PyObject *_wrap_wxColourData_GetColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourData_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxColourData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxColourData_GetColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColourData_GetColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -232,16 +225,17 @@ static PyObject *_wrap_wxColourData_GetColour(PyObject *self, PyObject *args) {
 }
 
 #define wxColourData_GetCustomColour(_swigobj,_swigarg0)  (_swigobj->GetCustomColour(_swigarg0))
-static PyObject *_wrap_wxColourData_GetCustomColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourData_GetCustomColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxColourData * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","i", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxColourData_GetCustomColour",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxColourData_GetCustomColour",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -261,14 +255,15 @@ static PyObject *_wrap_wxColourData_GetCustomColour(PyObject *self, PyObject *ar
 }
 
 #define wxColourData_SetChooseFull(_swigobj,_swigarg0)  (_swigobj->SetChooseFull(_swigarg0))
-static PyObject *_wrap_wxColourData_SetChooseFull(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourData_SetChooseFull(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourData * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxColourData_SetChooseFull",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxColourData_SetChooseFull",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -288,15 +283,16 @@ static PyObject *_wrap_wxColourData_SetChooseFull(PyObject *self, PyObject *args
 }
 
 #define wxColourData_SetColour(_swigobj,_swigarg0)  (_swigobj->SetColour(_swigarg0))
-static PyObject *_wrap_wxColourData_SetColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourData_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourData * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxColourData_SetColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxColourData_SetColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -323,16 +319,17 @@ static PyObject *_wrap_wxColourData_SetColour(PyObject *self, PyObject *args) {
 }
 
 #define wxColourData_SetCustomColour(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetCustomColour(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxColourData_SetCustomColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourData_SetCustomColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourData * _arg0;
     int  _arg1;
     wxColour * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","i","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxColourData_SetCustomColour",&_argo0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxColourData_SetCustomColour",_kwnames,&_argo0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -391,17 +388,18 @@ static void *SwigwxColourDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxColourDialog(_swigarg0,_swigarg1) (new wxColourDialog(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxColourDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxColourDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourDialog * _result;
     wxWindow * _arg0;
     wxColourData * _arg1 = (wxColourData *) NULL;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "parent","data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|O:new_wxColourDialog",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:new_wxColourDialog",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -433,15 +431,16 @@ static PyObject *_wrap_new_wxColourDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxColourDialog_GetColourData(_swigobj)  (_swigobj->GetColourData())
-static PyObject *_wrap_wxColourDialog_GetColourData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourDialog_GetColourData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourData * _result;
     wxColourDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxColourDialog_GetColourData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColourDialog_GetColourData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -467,14 +466,15 @@ static PyObject *_wrap_wxColourDialog_GetColourData(PyObject *self, PyObject *ar
 }
 
 #define wxColourDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxColourDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxColourDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxColourDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColourDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -525,7 +525,7 @@ static void *SwigwxDirDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxDirDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxDirDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDirDialog * _result;
     wxWindow * _arg0;
@@ -534,11 +534,13 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args) {
     long  _arg3 = (long ) 0;
     wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
     PyObject * _argo0 = 0;
-    PyObject * _argo4 = 0;
+    wxPoint  temp;
+    PyObject * _obj4 = 0;
+    char *_kwnames[] = { "parent","message","defaultPath","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|sslO:new_wxDirDialog",&_argo0,&_arg1,&_arg2,&_arg3,&_argo4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|sslO:new_wxDirDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_obj4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -547,13 +549,12 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    if (_argo4) {
-        if (_argo4 == Py_None) { _arg4 = NULL; }
-        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxDirDialog. Expected _wxPoint_p.");
+    if (_obj4)
+{
+    _arg4 = &temp;
+    if (! wxPoint_helper(_obj4, &_arg4))
         return NULL;
-        }
-    }
+}
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxDirDialog *)new_wxDirDialog(_arg0,_arg1,_arg2,_arg3,*_arg4);
@@ -570,14 +571,15 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxDirDialog_GetPath(_swigobj)  (_swigobj->GetPath())
-static PyObject *_wrap_wxDirDialog_GetPath(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDirDialog_GetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxDirDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDirDialog_GetPath",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDirDialog_GetPath",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -601,14 +603,15 @@ static PyObject *_wrap_wxDirDialog_GetPath(PyObject *self, PyObject *args) {
 }
 
 #define wxDirDialog_GetMessage(_swigobj)  (_swigobj->GetMessage())
-static PyObject *_wrap_wxDirDialog_GetMessage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDirDialog_GetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxDirDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDirDialog_GetMessage",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDirDialog_GetMessage",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -632,14 +635,15 @@ static PyObject *_wrap_wxDirDialog_GetMessage(PyObject *self, PyObject *args) {
 }
 
 #define wxDirDialog_GetStyle(_swigobj)  (_swigobj->GetStyle())
-static PyObject *_wrap_wxDirDialog_GetStyle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDirDialog_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxDirDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDirDialog_GetStyle",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDirDialog_GetStyle",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -658,15 +662,16 @@ static PyObject *_wrap_wxDirDialog_GetStyle(PyObject *self, PyObject *args) {
 }
 
 #define wxDirDialog_SetMessage(_swigobj,_swigarg0)  (_swigobj->SetMessage(_swigarg0))
-static PyObject *_wrap_wxDirDialog_SetMessage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDirDialog_SetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDirDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","message", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxDirDialog_SetMessage",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDirDialog_SetMessage",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -697,15 +702,16 @@ static PyObject *_wrap_wxDirDialog_SetMessage(PyObject *self, PyObject *args) {
 }
 
 #define wxDirDialog_SetPath(_swigobj,_swigarg0)  (_swigobj->SetPath(_swigarg0))
-static PyObject *_wrap_wxDirDialog_SetPath(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDirDialog_SetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDirDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","path", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxDirDialog_SetPath",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDirDialog_SetPath",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -736,14 +742,15 @@ static PyObject *_wrap_wxDirDialog_SetPath(PyObject *self, PyObject *args) {
 }
 
 #define wxDirDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxDirDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDirDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxDirDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDirDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDirDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -794,7 +801,7 @@ static void *SwigwxFileDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxFileDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxFileDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _result;
     wxWindow * _arg0;
@@ -805,11 +812,13 @@ static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args) {
     long  _arg5 = (long ) 0;
     wxPoint * _arg6 = (wxPoint *) &wxPyDefaultPosition;
     PyObject * _argo0 = 0;
-    PyObject * _argo6 = 0;
+    wxPoint  temp;
+    PyObject * _obj6 = 0;
+    char *_kwnames[] = { "parent","message","defaultDir","defaultFile","wildcard","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|sssslO:new_wxFileDialog",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|sssslO:new_wxFileDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_obj6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -818,13 +827,12 @@ static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    if (_argo6) {
-        if (_argo6 == Py_None) { _arg6 = NULL; }
-        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxFileDialog. Expected _wxPoint_p.");
+    if (_obj6)
+{
+    _arg6 = &temp;
+    if (! wxPoint_helper(_obj6, &_arg6))
         return NULL;
-        }
-    }
+}
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxFileDialog *)new_wxFileDialog(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,*_arg6);
@@ -841,14 +849,15 @@ static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_GetDirectory(_swigobj)  (_swigobj->GetDirectory())
-static PyObject *_wrap_wxFileDialog_GetDirectory(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetDirectory(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetDirectory",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetDirectory",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -872,14 +881,15 @@ static PyObject *_wrap_wxFileDialog_GetDirectory(PyObject *self, PyObject *args)
 }
 
 #define wxFileDialog_GetFilename(_swigobj)  (_swigobj->GetFilename())
-static PyObject *_wrap_wxFileDialog_GetFilename(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetFilename",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetFilename",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -903,14 +913,15 @@ static PyObject *_wrap_wxFileDialog_GetFilename(PyObject *self, PyObject *args)
 }
 
 #define wxFileDialog_GetFilterIndex(_swigobj)  (_swigobj->GetFilterIndex())
-static PyObject *_wrap_wxFileDialog_GetFilterIndex(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetFilterIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetFilterIndex",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetFilterIndex",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -929,14 +940,15 @@ static PyObject *_wrap_wxFileDialog_GetFilterIndex(PyObject *self, PyObject *arg
 }
 
 #define wxFileDialog_GetMessage(_swigobj)  (_swigobj->GetMessage())
-static PyObject *_wrap_wxFileDialog_GetMessage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetMessage",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetMessage",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -960,14 +972,15 @@ static PyObject *_wrap_wxFileDialog_GetMessage(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_GetPath(_swigobj)  (_swigobj->GetPath())
-static PyObject *_wrap_wxFileDialog_GetPath(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetPath",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetPath",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -991,14 +1004,15 @@ static PyObject *_wrap_wxFileDialog_GetPath(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_GetStyle(_swigobj)  (_swigobj->GetStyle())
-static PyObject *_wrap_wxFileDialog_GetStyle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetStyle",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetStyle",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1017,14 +1031,15 @@ static PyObject *_wrap_wxFileDialog_GetStyle(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_GetWildcard(_swigobj)  (_swigobj->GetWildcard())
-static PyObject *_wrap_wxFileDialog_GetWildcard(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetWildcard(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetWildcard",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetWildcard",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1048,15 +1063,16 @@ static PyObject *_wrap_wxFileDialog_GetWildcard(PyObject *self, PyObject *args)
 }
 
 #define wxFileDialog_SetDirectory(_swigobj,_swigarg0)  (_swigobj->SetDirectory(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetDirectory(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetDirectory(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","directory", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetDirectory",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetDirectory",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1087,15 +1103,16 @@ static PyObject *_wrap_wxFileDialog_SetDirectory(PyObject *self, PyObject *args)
 }
 
 #define wxFileDialog_SetFilename(_swigobj,_swigarg0)  (_swigobj->SetFilename(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetFilename(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","setfilename", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetFilename",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetFilename",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1126,14 +1143,15 @@ static PyObject *_wrap_wxFileDialog_SetFilename(PyObject *self, PyObject *args)
 }
 
 #define wxFileDialog_SetFilterIndex(_swigobj,_swigarg0)  (_swigobj->SetFilterIndex(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetFilterIndex(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetFilterIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","filterIndex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxFileDialog_SetFilterIndex",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFileDialog_SetFilterIndex",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1153,15 +1171,16 @@ static PyObject *_wrap_wxFileDialog_SetFilterIndex(PyObject *self, PyObject *arg
 }
 
 #define wxFileDialog_SetMessage(_swigobj,_swigarg0)  (_swigobj->SetMessage(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetMessage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","message", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetMessage",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetMessage",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1192,15 +1211,16 @@ static PyObject *_wrap_wxFileDialog_SetMessage(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_SetPath(_swigobj,_swigarg0)  (_swigobj->SetPath(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetPath(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","path", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetPath",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetPath",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1231,14 +1251,15 @@ static PyObject *_wrap_wxFileDialog_SetPath(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_SetStyle(_swigobj,_swigarg0)  (_swigobj->SetStyle(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetStyle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","style", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxFileDialog_SetStyle",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxFileDialog_SetStyle",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1258,15 +1279,16 @@ static PyObject *_wrap_wxFileDialog_SetStyle(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_SetWildcard(_swigobj,_swigarg0)  (_swigobj->SetWildcard(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetWildcard(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetWildcard(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","wildCard", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetWildcard",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetWildcard",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1297,14 +1319,15 @@ static PyObject *_wrap_wxFileDialog_SetWildcard(PyObject *self, PyObject *args)
 }
 
 #define wxFileDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxFileDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1359,7 +1382,7 @@ static wxSingleChoiceDialog *new_wxSingleChoiceDialog(wxWindow *parent,wxString
                                             LCOUNT, LIST, NULL, style, *pos);
         }
 
-static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSingleChoiceDialog * _result;
     wxWindow * _arg0;
@@ -1373,11 +1396,13 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args)
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj4 = 0;
-    PyObject * _argo6 = 0;
+    wxPoint  temp;
+    PyObject * _obj6 = 0;
+    char *_kwnames[] = { "parent","message","caption","LIST","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOOO|lO:new_wxSingleChoiceDialog",&_argo0,&_obj1,&_obj2,&_obj4,&_arg5,&_argo6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO|lO:new_wxSingleChoiceDialog",_kwnames,&_argo0,&_obj1,&_obj2,&_obj4,&_arg5,&_obj6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1407,13 +1432,12 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args)
         return NULL;
     }
 }
-    if (_argo6) {
-        if (_argo6 == Py_None) { _arg6 = NULL; }
-        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxSingleChoiceDialog. Expected _wxPoint_p.");
+    if (_obj6)
+{
+    _arg6 = &temp;
+    if (! wxPoint_helper(_obj6, &_arg6))
         return NULL;
-        }
-    }
+}
 {
     if (_obj4) {
         _arg3 = PyList_Size(_obj4);
@@ -1449,14 +1473,15 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args)
 }
 
 #define wxSingleChoiceDialog_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxSingleChoiceDialog_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSingleChoiceDialog_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSingleChoiceDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSingleChoiceDialog_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSingleChoiceDialog_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1475,14 +1500,15 @@ static PyObject *_wrap_wxSingleChoiceDialog_GetSelection(PyObject *self, PyObjec
 }
 
 #define wxSingleChoiceDialog_GetStringSelection(_swigobj)  (_swigobj->GetStringSelection())
-static PyObject *_wrap_wxSingleChoiceDialog_GetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSingleChoiceDialog_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxSingleChoiceDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSingleChoiceDialog_GetStringSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSingleChoiceDialog_GetStringSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1506,14 +1532,15 @@ static PyObject *_wrap_wxSingleChoiceDialog_GetStringSelection(PyObject *self, P
 }
 
 #define wxSingleChoiceDialog_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
-static PyObject *_wrap_wxSingleChoiceDialog_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSingleChoiceDialog_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSingleChoiceDialog * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","sel", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSingleChoiceDialog_SetSelection",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSingleChoiceDialog_SetSelection",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1533,14 +1560,15 @@ static PyObject *_wrap_wxSingleChoiceDialog_SetSelection(PyObject *self, PyObjec
 }
 
 #define wxSingleChoiceDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxSingleChoiceDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSingleChoiceDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSingleChoiceDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSingleChoiceDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSingleChoiceDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1591,7 +1619,7 @@ static void *SwigwxTextEntryDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxTextEntryDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxTextEntryDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextEntryDialog * _result;
     wxWindow * _arg0;
@@ -1601,11 +1629,13 @@ static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args) {
     long  _arg4 = (long ) wxOK|wxCANCEL|wxCENTRE;
     wxPoint * _arg5 = (wxPoint *) &wxPyDefaultPosition;
     PyObject * _argo0 = 0;
-    PyObject * _argo5 = 0;
+    wxPoint  temp;
+    PyObject * _obj5 = 0;
+    char *_kwnames[] = { "parent","message","caption","defaultValue","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Os|sslO:new_wxTextEntryDialog",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os|sslO:new_wxTextEntryDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_obj5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1614,13 +1644,12 @@ static PyObject *_wrap_new_wxTextEntryDialog(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_wxTextEntryDialog. Expected _wxPoint_p.");
+    if (_obj5)
+{
+    _arg5 = &temp;
+    if (! wxPoint_helper(_obj5, &_arg5))
         return NULL;
-        }
-    }
+}
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxTextEntryDialog *)new_wxTextEntryDialog(_arg0,_arg1,_arg2,_arg3,_arg4,*_arg5);
@@ -1637,14 +1666,15 @@ static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxTextEntryDialog_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxTextEntryDialog_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextEntryDialog_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxTextEntryDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextEntryDialog_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextEntryDialog_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1668,15 +1698,16 @@ static PyObject *_wrap_wxTextEntryDialog_GetValue(PyObject *self, PyObject *args
 }
 
 #define wxTextEntryDialog_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxTextEntryDialog_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextEntryDialog_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextEntryDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTextEntryDialog_SetValue",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextEntryDialog_SetValue",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1707,14 +1738,15 @@ static PyObject *_wrap_wxTextEntryDialog_SetValue(PyObject *self, PyObject *args
 }
 
 #define wxTextEntryDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxTextEntryDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextEntryDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxTextEntryDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextEntryDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextEntryDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1733,13 +1765,14 @@ static PyObject *_wrap_wxTextEntryDialog_ShowModal(PyObject *self, PyObject *arg
 }
 
 #define new_wxFontData() (new wxFontData())
-static PyObject *_wrap_new_wxFontData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxFontData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxFontData")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxFontData",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1757,13 +1790,14 @@ static PyObject *_wrap_new_wxFontData(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxFontData(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxFontData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxFontData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxFontData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxFontData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1783,15 +1817,16 @@ static PyObject *_wrap_delete_wxFontData(PyObject *self, PyObject *args) {
 }
 
 #define wxFontData_EnableEffects(_swigobj,_swigarg0)  (_swigobj->EnableEffects(_swigarg0))
-static PyObject *_wrap_wxFontData_EnableEffects(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_EnableEffects(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxFontData_EnableEffects",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFontData_EnableEffects",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1812,14 +1847,15 @@ static PyObject *_wrap_wxFontData_EnableEffects(PyObject *self, PyObject *args)
 }
 
 #define wxFontData_GetAllowSymbols(_swigobj)  (_swigobj->GetAllowSymbols())
-static PyObject *_wrap_wxFontData_GetAllowSymbols(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_GetAllowSymbols(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontData_GetAllowSymbols",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetAllowSymbols",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1838,15 +1874,16 @@ static PyObject *_wrap_wxFontData_GetAllowSymbols(PyObject *self, PyObject *args
 }
 
 #define wxFontData_GetColour(_swigobj)  (_swigobj->GetColour())
-static PyObject *_wrap_wxFontData_GetColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontData_GetColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1872,15 +1909,16 @@ static PyObject *_wrap_wxFontData_GetColour(PyObject *self, PyObject *args) {
 }
 
 #define wxFontData_GetChosenFont(_swigobj)  (_swigobj->GetChosenFont())
-static PyObject *_wrap_wxFontData_GetChosenFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_GetChosenFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFont * _result;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontData_GetChosenFont",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetChosenFont",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1900,14 +1938,15 @@ static PyObject *_wrap_wxFontData_GetChosenFont(PyObject *self, PyObject *args)
 }
 
 #define wxFontData_GetEnableEffects(_swigobj)  (_swigobj->GetEnableEffects())
-static PyObject *_wrap_wxFontData_GetEnableEffects(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_GetEnableEffects(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontData_GetEnableEffects",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetEnableEffects",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1926,15 +1965,16 @@ static PyObject *_wrap_wxFontData_GetEnableEffects(PyObject *self, PyObject *arg
 }
 
 #define wxFontData_GetInitialFont(_swigobj)  (_swigobj->GetInitialFont())
-static PyObject *_wrap_wxFontData_GetInitialFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_GetInitialFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFont * _result;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontData_GetInitialFont",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetInitialFont",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1954,14 +1994,15 @@ static PyObject *_wrap_wxFontData_GetInitialFont(PyObject *self, PyObject *args)
 }
 
 #define wxFontData_GetShowHelp(_swigobj)  (_swigobj->GetShowHelp())
-static PyObject *_wrap_wxFontData_GetShowHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_GetShowHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontData_GetShowHelp",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetShowHelp",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1980,15 +2021,16 @@ static PyObject *_wrap_wxFontData_GetShowHelp(PyObject *self, PyObject *args) {
 }
 
 #define wxFontData_SetAllowSymbols(_swigobj,_swigarg0)  (_swigobj->SetAllowSymbols(_swigarg0))
-static PyObject *_wrap_wxFontData_SetAllowSymbols(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_SetAllowSymbols(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","allowSymbols", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxFontData_SetAllowSymbols",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFontData_SetAllowSymbols",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2009,15 +2051,16 @@ static PyObject *_wrap_wxFontData_SetAllowSymbols(PyObject *self, PyObject *args
 }
 
 #define wxFontData_SetChosenFont(_swigobj,_swigarg0)  (_swigobj->SetChosenFont(_swigarg0))
-static PyObject *_wrap_wxFontData_SetChosenFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_SetChosenFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     wxFont * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFontData_SetChosenFont",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontData_SetChosenFont",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2044,15 +2087,16 @@ static PyObject *_wrap_wxFontData_SetChosenFont(PyObject *self, PyObject *args)
 }
 
 #define wxFontData_SetColour(_swigobj,_swigarg0)  (_swigobj->SetColour(_swigarg0))
-static PyObject *_wrap_wxFontData_SetColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFontData_SetColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontData_SetColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2079,15 +2123,16 @@ static PyObject *_wrap_wxFontData_SetColour(PyObject *self, PyObject *args) {
 }
 
 #define wxFontData_SetInitialFont(_swigobj,_swigarg0)  (_swigobj->SetInitialFont(_swigarg0))
-static PyObject *_wrap_wxFontData_SetInitialFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_SetInitialFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     wxFont * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFontData_SetInitialFont",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontData_SetInitialFont",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2114,15 +2159,16 @@ static PyObject *_wrap_wxFontData_SetInitialFont(PyObject *self, PyObject *args)
 }
 
 #define wxFontData_SetRange(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetRange(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxFontData_SetRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_SetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","min","max", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxFontData_SetRange",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxFontData_SetRange",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2142,15 +2188,16 @@ static PyObject *_wrap_wxFontData_SetRange(PyObject *self, PyObject *args) {
 }
 
 #define wxFontData_SetShowHelp(_swigobj,_swigarg0)  (_swigobj->SetShowHelp(_swigarg0))
-static PyObject *_wrap_wxFontData_SetShowHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_SetShowHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","showHelp", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxFontData_SetShowHelp",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFontData_SetShowHelp",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2203,17 +2250,18 @@ static void *SwigwxFontDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxFontDialog(_swigarg0,_swigarg1) (new wxFontDialog(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxFontDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxFontDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontDialog * _result;
     wxWindow * _arg0;
     wxFontData * _arg1 = (wxFontData *) NULL;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "parent","data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|O:new_wxFontDialog",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:new_wxFontDialog",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2245,15 +2293,16 @@ static PyObject *_wrap_new_wxFontDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxFontDialog_GetFontData(_swigobj)  (_swigobj->GetFontData())
-static PyObject *_wrap_wxFontDialog_GetFontData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontDialog_GetFontData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _result;
     wxFontDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontDialog_GetFontData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontDialog_GetFontData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2279,14 +2328,15 @@ static PyObject *_wrap_wxFontDialog_GetFontData(PyObject *self, PyObject *args)
 }
 
 #define wxFontDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxFontDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxFontDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2337,7 +2387,7 @@ static void *SwigwxMessageDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxMessageDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxMessageDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMessageDialog * _result;
     wxWindow * _arg0;
@@ -2346,11 +2396,13 @@ static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args) {
     long  _arg3 = (long ) wxOK|wxCANCEL|wxCENTRE;
     wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
     PyObject * _argo0 = 0;
-    PyObject * _argo4 = 0;
+    wxPoint  temp;
+    PyObject * _obj4 = 0;
+    char *_kwnames[] = { "parent","message","caption","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Os|slO:new_wxMessageDialog",&_argo0,&_arg1,&_arg2,&_arg3,&_argo4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os|slO:new_wxMessageDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_obj4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2359,13 +2411,12 @@ static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    if (_argo4) {
-        if (_argo4 == Py_None) { _arg4 = NULL; }
-        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMessageDialog. Expected _wxPoint_p.");
+    if (_obj4)
+{
+    _arg4 = &temp;
+    if (! wxPoint_helper(_obj4, &_arg4))
         return NULL;
-        }
-    }
+}
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxMessageDialog *)new_wxMessageDialog(_arg0,_arg1,_arg2,_arg3,*_arg4);
@@ -2382,14 +2433,15 @@ static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxMessageDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxMessageDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMessageDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxMessageDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMessageDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMessageDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2432,7 +2484,7 @@ static void *SwigwxProgressDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxProgressDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxProgressDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxProgressDialog * _result;
     wxString * _arg0;
@@ -2443,10 +2495,11 @@ static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args) {
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "title","message","maximum","parent","style", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|iOi:new_wxProgressDialog",&_obj0,&_obj1,&_arg2,&_argo3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iOi:new_wxProgressDialog",_kwnames,&_obj0,&_obj1,&_arg2,&_argo3,&_arg4)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -2493,16 +2546,17 @@ static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxProgressDialog_Update(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Update(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxProgressDialog_Update(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxProgressDialog_Update(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxProgressDialog * _arg0;
     int  _arg1 = (int ) -1;
     char * _arg2 = (char *) NULL;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","value","newmsg", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|is:wxProgressDialog_Update",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|is:wxProgressDialog_Update",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2521,13 +2575,14 @@ static PyObject *_wrap_wxProgressDialog_Update(PyObject *self, PyObject *args) {
 }
 
 #define wxProgressDialog_Resume(_swigobj)  (_swigobj->Resume())
-static PyObject *_wrap_wxProgressDialog_Resume(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxProgressDialog_Resume(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxProgressDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxProgressDialog_Resume",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxProgressDialog_Resume",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2547,72 +2602,72 @@ static PyObject *_wrap_wxProgressDialog_Resume(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef cmndlgscMethods[] = {
-        { "wxProgressDialog_Resume", _wrap_wxProgressDialog_Resume, METH_VARARGS },
-        { "wxProgressDialog_Update", _wrap_wxProgressDialog_Update, METH_VARARGS },
-        { "new_wxProgressDialog", _wrap_new_wxProgressDialog, METH_VARARGS },
-        { "wxMessageDialog_ShowModal", _wrap_wxMessageDialog_ShowModal, METH_VARARGS },
-        { "new_wxMessageDialog", _wrap_new_wxMessageDialog, METH_VARARGS },
-        { "wxFontDialog_ShowModal", _wrap_wxFontDialog_ShowModal, METH_VARARGS },
-        { "wxFontDialog_GetFontData", _wrap_wxFontDialog_GetFontData, METH_VARARGS },
-        { "new_wxFontDialog", _wrap_new_wxFontDialog, METH_VARARGS },
-        { "wxFontData_SetShowHelp", _wrap_wxFontData_SetShowHelp, METH_VARARGS },
-        { "wxFontData_SetRange", _wrap_wxFontData_SetRange, METH_VARARGS },
-        { "wxFontData_SetInitialFont", _wrap_wxFontData_SetInitialFont, METH_VARARGS },
-        { "wxFontData_SetColour", _wrap_wxFontData_SetColour, METH_VARARGS },
-        { "wxFontData_SetChosenFont", _wrap_wxFontData_SetChosenFont, METH_VARARGS },
-        { "wxFontData_SetAllowSymbols", _wrap_wxFontData_SetAllowSymbols, METH_VARARGS },
-        { "wxFontData_GetShowHelp", _wrap_wxFontData_GetShowHelp, METH_VARARGS },
-        { "wxFontData_GetInitialFont", _wrap_wxFontData_GetInitialFont, METH_VARARGS },
-        { "wxFontData_GetEnableEffects", _wrap_wxFontData_GetEnableEffects, METH_VARARGS },
-        { "wxFontData_GetChosenFont", _wrap_wxFontData_GetChosenFont, METH_VARARGS },
-        { "wxFontData_GetColour", _wrap_wxFontData_GetColour, METH_VARARGS },
-        { "wxFontData_GetAllowSymbols", _wrap_wxFontData_GetAllowSymbols, METH_VARARGS },
-        { "wxFontData_EnableEffects", _wrap_wxFontData_EnableEffects, METH_VARARGS },
-        { "delete_wxFontData", _wrap_delete_wxFontData, METH_VARARGS },
-        { "new_wxFontData", _wrap_new_wxFontData, METH_VARARGS },
-        { "wxTextEntryDialog_ShowModal", _wrap_wxTextEntryDialog_ShowModal, METH_VARARGS },
-        { "wxTextEntryDialog_SetValue", _wrap_wxTextEntryDialog_SetValue, METH_VARARGS },
-        { "wxTextEntryDialog_GetValue", _wrap_wxTextEntryDialog_GetValue, METH_VARARGS },
-        { "new_wxTextEntryDialog", _wrap_new_wxTextEntryDialog, METH_VARARGS },
-        { "wxSingleChoiceDialog_ShowModal", _wrap_wxSingleChoiceDialog_ShowModal, METH_VARARGS },
-        { "wxSingleChoiceDialog_SetSelection", _wrap_wxSingleChoiceDialog_SetSelection, METH_VARARGS },
-        { "wxSingleChoiceDialog_GetStringSelection", _wrap_wxSingleChoiceDialog_GetStringSelection, METH_VARARGS },
-        { "wxSingleChoiceDialog_GetSelection", _wrap_wxSingleChoiceDialog_GetSelection, METH_VARARGS },
-        { "new_wxSingleChoiceDialog", _wrap_new_wxSingleChoiceDialog, METH_VARARGS },
-        { "wxFileDialog_ShowModal", _wrap_wxFileDialog_ShowModal, METH_VARARGS },
-        { "wxFileDialog_SetWildcard", _wrap_wxFileDialog_SetWildcard, METH_VARARGS },
-        { "wxFileDialog_SetStyle", _wrap_wxFileDialog_SetStyle, METH_VARARGS },
-        { "wxFileDialog_SetPath", _wrap_wxFileDialog_SetPath, METH_VARARGS },
-        { "wxFileDialog_SetMessage", _wrap_wxFileDialog_SetMessage, METH_VARARGS },
-        { "wxFileDialog_SetFilterIndex", _wrap_wxFileDialog_SetFilterIndex, METH_VARARGS },
-        { "wxFileDialog_SetFilename", _wrap_wxFileDialog_SetFilename, METH_VARARGS },
-        { "wxFileDialog_SetDirectory", _wrap_wxFileDialog_SetDirectory, METH_VARARGS },
-        { "wxFileDialog_GetWildcard", _wrap_wxFileDialog_GetWildcard, METH_VARARGS },
-        { "wxFileDialog_GetStyle", _wrap_wxFileDialog_GetStyle, METH_VARARGS },
-        { "wxFileDialog_GetPath", _wrap_wxFileDialog_GetPath, METH_VARARGS },
-        { "wxFileDialog_GetMessage", _wrap_wxFileDialog_GetMessage, METH_VARARGS },
-        { "wxFileDialog_GetFilterIndex", _wrap_wxFileDialog_GetFilterIndex, METH_VARARGS },
-        { "wxFileDialog_GetFilename", _wrap_wxFileDialog_GetFilename, METH_VARARGS },
-        { "wxFileDialog_GetDirectory", _wrap_wxFileDialog_GetDirectory, METH_VARARGS },
-        { "new_wxFileDialog", _wrap_new_wxFileDialog, METH_VARARGS },
-        { "wxDirDialog_ShowModal", _wrap_wxDirDialog_ShowModal, METH_VARARGS },
-        { "wxDirDialog_SetPath", _wrap_wxDirDialog_SetPath, METH_VARARGS },
-        { "wxDirDialog_SetMessage", _wrap_wxDirDialog_SetMessage, METH_VARARGS },
-        { "wxDirDialog_GetStyle", _wrap_wxDirDialog_GetStyle, METH_VARARGS },
-        { "wxDirDialog_GetMessage", _wrap_wxDirDialog_GetMessage, METH_VARARGS },
-        { "wxDirDialog_GetPath", _wrap_wxDirDialog_GetPath, METH_VARARGS },
-        { "new_wxDirDialog", _wrap_new_wxDirDialog, METH_VARARGS },
-        { "wxColourDialog_ShowModal", _wrap_wxColourDialog_ShowModal, METH_VARARGS },
-        { "wxColourDialog_GetColourData", _wrap_wxColourDialog_GetColourData, METH_VARARGS },
-        { "new_wxColourDialog", _wrap_new_wxColourDialog, METH_VARARGS },
-        { "wxColourData_SetCustomColour", _wrap_wxColourData_SetCustomColour, METH_VARARGS },
-        { "wxColourData_SetColour", _wrap_wxColourData_SetColour, METH_VARARGS },
-        { "wxColourData_SetChooseFull", _wrap_wxColourData_SetChooseFull, METH_VARARGS },
-        { "wxColourData_GetCustomColour", _wrap_wxColourData_GetCustomColour, METH_VARARGS },
-        { "wxColourData_GetColour", _wrap_wxColourData_GetColour, METH_VARARGS },
-        { "wxColourData_GetChooseFull", _wrap_wxColourData_GetChooseFull, METH_VARARGS },
-        { "delete_wxColourData", _wrap_delete_wxColourData, METH_VARARGS },
-        { "new_wxColourData", _wrap_new_wxColourData, METH_VARARGS },
+        { "wxProgressDialog_Resume", (PyCFunction) _wrap_wxProgressDialog_Resume, METH_VARARGS | METH_KEYWORDS },
+        { "wxProgressDialog_Update", (PyCFunction) _wrap_wxProgressDialog_Update, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxProgressDialog", (PyCFunction) _wrap_new_wxProgressDialog, METH_VARARGS | METH_KEYWORDS },
+        { "wxMessageDialog_ShowModal", (PyCFunction) _wrap_wxMessageDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxMessageDialog", (PyCFunction) _wrap_new_wxMessageDialog, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontDialog_ShowModal", (PyCFunction) _wrap_wxFontDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontDialog_GetFontData", (PyCFunction) _wrap_wxFontDialog_GetFontData, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxFontDialog", (PyCFunction) _wrap_new_wxFontDialog, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontData_SetShowHelp", (PyCFunction) _wrap_wxFontData_SetShowHelp, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontData_SetRange", (PyCFunction) _wrap_wxFontData_SetRange, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontData_SetInitialFont", (PyCFunction) _wrap_wxFontData_SetInitialFont, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontData_SetColour", (PyCFunction) _wrap_wxFontData_SetColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontData_SetChosenFont", (PyCFunction) _wrap_wxFontData_SetChosenFont, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontData_SetAllowSymbols", (PyCFunction) _wrap_wxFontData_SetAllowSymbols, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontData_GetShowHelp", (PyCFunction) _wrap_wxFontData_GetShowHelp, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontData_GetInitialFont", (PyCFunction) _wrap_wxFontData_GetInitialFont, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontData_GetEnableEffects", (PyCFunction) _wrap_wxFontData_GetEnableEffects, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontData_GetChosenFont", (PyCFunction) _wrap_wxFontData_GetChosenFont, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontData_GetColour", (PyCFunction) _wrap_wxFontData_GetColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontData_GetAllowSymbols", (PyCFunction) _wrap_wxFontData_GetAllowSymbols, METH_VARARGS | METH_KEYWORDS },
+        { "wxFontData_EnableEffects", (PyCFunction) _wrap_wxFontData_EnableEffects, METH_VARARGS | METH_KEYWORDS },
+        { "delete_wxFontData", (PyCFunction) _wrap_delete_wxFontData, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxFontData", (PyCFunction) _wrap_new_wxFontData, METH_VARARGS | METH_KEYWORDS },
+        { "wxTextEntryDialog_ShowModal", (PyCFunction) _wrap_wxTextEntryDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+        { "wxTextEntryDialog_SetValue", (PyCFunction) _wrap_wxTextEntryDialog_SetValue, METH_VARARGS | METH_KEYWORDS },
+        { "wxTextEntryDialog_GetValue", (PyCFunction) _wrap_wxTextEntryDialog_GetValue, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxTextEntryDialog", (PyCFunction) _wrap_new_wxTextEntryDialog, METH_VARARGS | METH_KEYWORDS },
+        { "wxSingleChoiceDialog_ShowModal", (PyCFunction) _wrap_wxSingleChoiceDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+        { "wxSingleChoiceDialog_SetSelection", (PyCFunction) _wrap_wxSingleChoiceDialog_SetSelection, METH_VARARGS | METH_KEYWORDS },
+        { "wxSingleChoiceDialog_GetStringSelection", (PyCFunction) _wrap_wxSingleChoiceDialog_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
+        { "wxSingleChoiceDialog_GetSelection", (PyCFunction) _wrap_wxSingleChoiceDialog_GetSelection, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxSingleChoiceDialog", (PyCFunction) _wrap_new_wxSingleChoiceDialog, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_ShowModal", (PyCFunction) _wrap_wxFileDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_SetWildcard", (PyCFunction) _wrap_wxFileDialog_SetWildcard, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_SetStyle", (PyCFunction) _wrap_wxFileDialog_SetStyle, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_SetPath", (PyCFunction) _wrap_wxFileDialog_SetPath, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_SetMessage", (PyCFunction) _wrap_wxFileDialog_SetMessage, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_SetFilterIndex", (PyCFunction) _wrap_wxFileDialog_SetFilterIndex, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_SetFilename", (PyCFunction) _wrap_wxFileDialog_SetFilename, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_SetDirectory", (PyCFunction) _wrap_wxFileDialog_SetDirectory, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_GetWildcard", (PyCFunction) _wrap_wxFileDialog_GetWildcard, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_GetStyle", (PyCFunction) _wrap_wxFileDialog_GetStyle, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_GetPath", (PyCFunction) _wrap_wxFileDialog_GetPath, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_GetMessage", (PyCFunction) _wrap_wxFileDialog_GetMessage, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_GetFilterIndex", (PyCFunction) _wrap_wxFileDialog_GetFilterIndex, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_GetFilename", (PyCFunction) _wrap_wxFileDialog_GetFilename, METH_VARARGS | METH_KEYWORDS },
+        { "wxFileDialog_GetDirectory", (PyCFunction) _wrap_wxFileDialog_GetDirectory, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxFileDialog", (PyCFunction) _wrap_new_wxFileDialog, METH_VARARGS | METH_KEYWORDS },
+        { "wxDirDialog_ShowModal", (PyCFunction) _wrap_wxDirDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+        { "wxDirDialog_SetPath", (PyCFunction) _wrap_wxDirDialog_SetPath, METH_VARARGS | METH_KEYWORDS },
+        { "wxDirDialog_SetMessage", (PyCFunction) _wrap_wxDirDialog_SetMessage, METH_VARARGS | METH_KEYWORDS },
+        { "wxDirDialog_GetStyle", (PyCFunction) _wrap_wxDirDialog_GetStyle, METH_VARARGS | METH_KEYWORDS },
+        { "wxDirDialog_GetMessage", (PyCFunction) _wrap_wxDirDialog_GetMessage, METH_VARARGS | METH_KEYWORDS },
+        { "wxDirDialog_GetPath", (PyCFunction) _wrap_wxDirDialog_GetPath, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxDirDialog", (PyCFunction) _wrap_new_wxDirDialog, METH_VARARGS | METH_KEYWORDS },
+        { "wxColourDialog_ShowModal", (PyCFunction) _wrap_wxColourDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+        { "wxColourDialog_GetColourData", (PyCFunction) _wrap_wxColourDialog_GetColourData, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxColourDialog", (PyCFunction) _wrap_new_wxColourDialog, METH_VARARGS | METH_KEYWORDS },
+        { "wxColourData_SetCustomColour", (PyCFunction) _wrap_wxColourData_SetCustomColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxColourData_SetColour", (PyCFunction) _wrap_wxColourData_SetColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxColourData_SetChooseFull", (PyCFunction) _wrap_wxColourData_SetChooseFull, METH_VARARGS | METH_KEYWORDS },
+        { "wxColourData_GetCustomColour", (PyCFunction) _wrap_wxColourData_GetCustomColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxColourData_GetColour", (PyCFunction) _wrap_wxColourData_GetColour, METH_VARARGS | METH_KEYWORDS },
+        { "wxColourData_GetChooseFull", (PyCFunction) _wrap_wxColourData_GetChooseFull, METH_VARARGS | METH_KEYWORDS },
+        { "delete_wxColourData", (PyCFunction) _wrap_delete_wxColourData, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxColourData", (PyCFunction) _wrap_new_wxColourData, METH_VARARGS | METH_KEYWORDS },
         { NULL, NULL }
 };
 #ifdef __cplusplus
@@ -2627,6 +2682,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},
@@ -2634,8 +2693,10 @@ 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},
     { "_wxFontData","_class_wxFontData",0},
     { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0},
     { "_class_wxMenuBar","_wxMenuBar",0},
     { "_class_wxEvtHandler","_class_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler},
     { "_class_wxEvtHandler","_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler},
@@ -2663,28 +2724,37 @@ 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_wxChoice",0},
     { "_wxSlider","_class_wxSlider",0},
     { "_long","_wxDash",0},
     { "_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},
     { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
     { "_wxProgressDialog","_class_wxProgressDialog",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},
@@ -2709,6 +2779,7 @@ 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","_class_wxMessageDialog",SwigwxMessageDialogTowxDialog},
@@ -2726,18 +2797,24 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxDialog","_class_wxColourDialog",SwigwxColourDialogTowxDialog},
     { "_class_wxDialog","_wxColourDialog",SwigwxColourDialogTowxDialog},
     { "_class_wxDialog","_wxDialog",0},
+    { "_class_wxFileDataObject","_wxFileDataObject",0},
     { "_wxIdleEvent","_class_wxIdleEvent",0},
     { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
     { "_wxToolBar","_class_wxToolBar",0},
+    { "_class_wxDataObject","_wxDataObject",0},
     { "_wxStaticLine","_class_wxStaticLine",0},
     { "_wxBrush","_class_wxBrush",0},
     { "_wxMiniFrame","_class_wxMiniFrame",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},
@@ -2757,27 +2834,36 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
     { "_class_wxNotifyEvent","_wxNotifyEvent",0},
     { "_wxMessageDialog","_class_wxMessageDialog",0},
+    { "_class_wxValidator","_wxValidator",0},
     { "_class_wxPyEvent","_wxPyEvent",0},
     { "_wxTextEntryDialog","_class_wxTextEntryDialog",0},
     { "_class_wxIconizeEvent","_wxIconizeEvent",0},
     { "_class_wxStaticBitmap","_wxStaticBitmap",0},
     { "_class_wxToolBar","_wxToolBar",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},
     { "_class_wxProgressDialog","_wxProgressDialog",0},
+    { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0},
+    { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0},
     { "_class_wxDirDialog","_wxDirDialog",0},
     { "_class_wxPyTimer","_wxPyTimer",0},
     { "_wxFocusEvent","_class_wxFocusEvent",0},
@@ -2803,6 +2889,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxComboBox","_class_wxComboBox",0},
     { "_wxRadioButton","_class_wxRadioButton",0},
     { "_class_wxMessageDialog","_wxMessageDialog",0},
+    { "_signed_int","_wxCoord",0},
     { "_signed_int","_wxPrintQuality",0},
     { "_signed_int","_EBool",0},
     { "_signed_int","_wxWindowID",0},
@@ -2810,6 +2897,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_wxListBox",0},
@@ -2818,6 +2906,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_WXTYPE","_signed_short",0},
     { "_WXTYPE","_unsigned_short",0},
     { "_wxFileDialog","_class_wxFileDialog",0},
+    { "_class_wxDropTarget","_wxDropTarget",0},
     { "_class_wxBrush","_wxBrush",0},
     { "_unsigned_short","_WXTYPE",0},
     { "_unsigned_short","_short",0},
@@ -2840,8 +2929,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},
     { "_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0},
@@ -2851,6 +2945,7 @@ 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},
@@ -2859,12 +2954,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxToolBarTool","_wxToolBarTool",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},
     { "_class_wxMenu","_wxMenu",0},
     { "_wxControl","_class_wxControl",0},
     { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_wxCoord",0},
     { "_unsigned_int","_wxPrintQuality",0},
     { "_unsigned_int","_size_t",0},
     { "_unsigned_int","_uint",0},
@@ -2892,6 +2989,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","_wxChoice",0},
@@ -2901,6 +3000,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxFrame","_class_wxProgressDialog",SwigwxProgressDialogTowxFrame},
     { "_wxFrame","_wxProgressDialog",SwigwxProgressDialogTowxFrame},
     { "_wxFrame","_class_wxFrame",0},
+    { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
+    { "_wxWindowID","_wxCoord",0},
     { "_wxWindowID","_wxPrintQuality",0},
     { "_wxWindowID","_size_t",0},
     { "_wxWindowID","_EBool",0},
@@ -2908,6 +3009,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},
@@ -2916,16 +3019,22 @@ 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_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","_wxControl",0},
@@ -2935,21 +3044,34 @@ 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},
     { "_class_wxMiniFrame","_wxMiniFrame",0},
     { "_wxFontDialog","_class_wxFontDialog",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},
     { "_wxDirDialog","_class_wxDirDialog",0},
     { "_wxEvtHandler","_class_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler},
@@ -2980,7 +3102,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxMoveEvent","_class_wxMoveEvent",0},
     { "_wxColourData","_class_wxColourData",0},
     { "_class_wxPalette","_wxPalette",0},
+    { "_wxFileDataObject","_class_wxFileDataObject",0},
     { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
     { "_class_wxFontDialog","_wxFontDialog",0},
     { "_wxWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxWindow},
     { "_wxWindow","_wxProgressDialog",SwigwxProgressDialogTowxWindow},
@@ -2999,6 +3123,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxWindow","_class_wxColourDialog",SwigwxColourDialogTowxWindow},
     { "_wxWindow","_wxColourDialog",SwigwxColourDialogTowxWindow},
     { "_wxWindow","_class_wxWindow",0},
+    { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0},
     { "_class_wxFrame","_class_wxProgressDialog",SwigwxProgressDialogTowxFrame},
     { "_class_wxFrame","_wxProgressDialog",SwigwxProgressDialogTowxFrame},
     { "_class_wxFrame","_wxFrame",0},