X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bf5d46efb26ab22575ca9bc0d0ca5d32d6b77a3..984ef9dce7bcc69881176a89c5fe8a80511ea58c:/utils/wxPython/src/msw/cmndlgs.cpp

diff --git a/utils/wxPython/src/msw/cmndlgs.cpp b/utils/wxPython/src/msw/cmndlgs.cpp
index f5a35172ff..f39258cd2b 100644
--- 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 5)
+ * Version 1.1 (Build 810)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
-#	define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#	define SWIGEXPORT(a) __declspec(dllexport) a
 #   else
 #	if defined(__BORLANDC__)
-#	    define SWIGEXPORT(a,b) a _export b
+#	    define SWIGEXPORT(a) a _export 
 #	else
-#	    define SWIGEXPORT(a,b) a b
+#	    define SWIGEXPORT(a) a 
 #	endif
 #   endif
 #else
-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 
 #endif
 
 #ifdef __cplusplus
@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
-
 #define SWIG_init    initcmndlgsc
 
 #define SWIG_name    "cmndlgsc"
@@ -61,12 +61,13 @@ extern PyObject *SWIG_newvarlink(void);
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   
         target = o;
-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
-    } else {
+    } else {                         
         if (!PyList_Check(target)) {
             o2 = target;
             target = PyList_New(0);
@@ -83,70 +84,70 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
 
-    if (!target) {
+    if (!target) {                   
         target = o;
-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
-    } else {
+    } else {                         
         if (!PyTuple_Check(target)) {
             o2 = target;
             target = PyTuple_New(1);
             PyTuple_SetItem(target, 0, o2);
         }
-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      
 
         o2 = target;
-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      
         Py_DECREF(o3);
     }
     return target;
 }
 
-
-extern byte* byte_LIST_helper(PyObject* source);
-extern int* int_LIST_helper(PyObject* source);
-extern long* long_LIST_helper(PyObject* source);
-extern char** string_LIST_helper(PyObject* source);
-extern wxPoint* wxPoint_LIST_helper(PyObject* source);
-extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
-extern wxString* wxString_LIST_helper(PyObject* source);
-extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
-
-
 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;
         _result = (wxColourData *)new_wxColourData();
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColourData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColourData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
 #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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxColourData",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxColourData",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxColourData. Expected _wxColourData_p.");
         return NULL;
         }
@@ -162,17 +163,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxColourData_GetChooseFull",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColourData_GetChooseFull",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_GetChooseFull. Expected _wxColourData_p.");
         return NULL;
         }
@@ -187,18 +190,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxColourData_GetColour",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColourData_GetColour",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_GetColour. Expected _wxColourData_p.");
         return NULL;
         }
@@ -209,25 +214,32 @@ static PyObject *_wrap_wxColourData_GetColour(PyObject *self, PyObject *args) {
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
 #define 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","i", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxColourData_GetCustomColour",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxColourData_GetCustomColour",_kwnames,&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_GetCustomColour. Expected _wxColourData_p.");
         return NULL;
         }
@@ -243,17 +255,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxColourData_SetChooseFull",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxColourData_SetChooseFull",_kwnames,&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_SetChooseFull. Expected _wxColourData_p.");
         return NULL;
         }
@@ -269,24 +283,27 @@ 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;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxColourData_SetColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxColourData_SetColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_SetColour. Expected _wxColourData_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxColourData_SetColour. Expected _wxColour_p.");
         return NULL;
         }
@@ -302,25 +319,28 @@ 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;
-    char * _argc0 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","i","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sis:wxColourData_SetCustomColour",&_argc0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxColourData_SetCustomColour",_kwnames,&_argo0,&_arg1,&_argo2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourData_SetCustomColour. Expected _wxColourData_p.");
         return NULL;
         }
     }
-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxColour_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxColourData_SetCustomColour. Expected _wxColour_p.");
         return NULL;
         }
@@ -368,26 +388,29 @@ 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 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxColourData * _arg1 = (wxColourData *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "parent","data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|s:new_wxColourDialog",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:new_wxColourDialog",_kwnames,&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxColourDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColourData_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColourData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxColourDialog. Expected _wxColourData_p.");
         return NULL;
         }
@@ -397,24 +420,31 @@ static PyObject *_wrap_new_wxColourDialog(PyObject *self, PyObject *args) {
         _result = (wxColourDialog *)new_wxColourDialog(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColourDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColourDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
 #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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxColourDialog_GetColourData",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColourDialog_GetColourData",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourDialog_GetColourData. Expected _wxColourDialog_p.");
         return NULL;
         }
@@ -425,23 +455,30 @@ static PyObject *_wrap_wxColourDialog_GetColourData(PyObject *self, PyObject *ar
     _result = (wxColourData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColourData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColourData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
 #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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxColourDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColourDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColourDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourDialog_ShowModal. Expected _wxColourDialog_p.");
         return NULL;
         }
@@ -488,55 +525,65 @@ 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;
-    char * _arg1 = "Choose a directory";
-    char * _arg2 = "";
-    long  _arg3 = 0;
-    wxPoint * _arg4 = &wxPyDefaultPosition;
-    char * _argc0 = 0;
-    char * _argc4 = 0;
+    char * _arg1 = (char *) "Choose a directory";
+    char * _arg2 = (char *) "";
+    long  _arg3 = (long ) 0;
+    wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
+    PyObject * _argo0 = 0;
+    wxPoint  temp;
+    PyObject * _obj4 = 0;
+    char *_kwnames[] = { "parent","message","defaultPath","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|ssls:new_wxDirDialog",&_argc0,&_arg1,&_arg2,&_arg3,&_argc4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|sslO:new_wxDirDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_obj4)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxDirDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(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);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxDirDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxDirDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
 #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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDirDialog_GetPath",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDirDialog_GetPath",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDirDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_GetPath. Expected _wxDirDialog_p.");
         return NULL;
         }
@@ -547,7 +594,7 @@ static PyObject *_wrap_wxDirDialog_GetPath(PyObject *self, PyObject *args) {
 
     wxPy_END_ALLOW_THREADS;
 }{
-    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
 }
 {
     delete _result;
@@ -556,17 +603,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDirDialog_GetMessage",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDirDialog_GetMessage",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDirDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_GetMessage. Expected _wxDirDialog_p.");
         return NULL;
         }
@@ -577,7 +626,7 @@ static PyObject *_wrap_wxDirDialog_GetMessage(PyObject *self, PyObject *args) {
 
     wxPy_END_ALLOW_THREADS;
 }{
-    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
 }
 {
     delete _result;
@@ -586,17 +635,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDirDialog_GetStyle",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDirDialog_GetStyle",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDirDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_GetStyle. Expected _wxDirDialog_p.");
         return NULL;
         }
@@ -611,18 +662,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","message", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxDirDialog_SetMessage",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDirDialog_SetMessage",_kwnames,&_argo0,&_obj1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDirDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_SetMessage. Expected _wxDirDialog_p.");
         return NULL;
         }
@@ -649,18 +702,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","path", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxDirDialog_SetPath",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDirDialog_SetPath",_kwnames,&_argo0,&_obj1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDirDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_SetPath. Expected _wxDirDialog_p.");
         return NULL;
         }
@@ -687,17 +742,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDirDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDirDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDirDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_ShowModal. Expected _wxDirDialog_p.");
         return NULL;
         }
@@ -744,57 +801,67 @@ 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;
-    char * _arg1 = "Choose a file";
-    char * _arg2 = "";
-    char * _arg3 = "";
-    char * _arg4 = "*.*";
-    long  _arg5 = 0;
-    wxPoint * _arg6 = &wxPyDefaultPosition;
-    char * _argc0 = 0;
-    char * _argc6 = 0;
+    char * _arg1 = (char *) "Choose a file";
+    char * _arg2 = (char *) "";
+    char * _arg3 = (char *) "";
+    char * _arg4 = (char *) "*.*";
+    long  _arg5 = (long ) 0;
+    wxPoint * _arg6 = (wxPoint *) &wxPyDefaultPosition;
+    PyObject * _argo0 = 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,"s|ssssls:new_wxFileDialog",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argc6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|sssslO:new_wxFileDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_obj6)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxFileDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(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);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFileDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFileDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
 #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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetDirectory",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetDirectory",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetDirectory. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -805,7 +872,7 @@ static PyObject *_wrap_wxFileDialog_GetDirectory(PyObject *self, PyObject *args)
 
     wxPy_END_ALLOW_THREADS;
 }{
-    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
 }
 {
     delete _result;
@@ -814,17 +881,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetFilename",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetFilename",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetFilename. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -835,7 +904,7 @@ static PyObject *_wrap_wxFileDialog_GetFilename(PyObject *self, PyObject *args)
 
     wxPy_END_ALLOW_THREADS;
 }{
-    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
 }
 {
     delete _result;
@@ -844,17 +913,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetFilterIndex",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetFilterIndex",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetFilterIndex. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -869,17 +940,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetMessage",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetMessage",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetMessage. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -890,7 +963,7 @@ static PyObject *_wrap_wxFileDialog_GetMessage(PyObject *self, PyObject *args) {
 
     wxPy_END_ALLOW_THREADS;
 }{
-    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
 }
 {
     delete _result;
@@ -899,17 +972,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetPath",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetPath",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetPath. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -920,7 +995,7 @@ static PyObject *_wrap_wxFileDialog_GetPath(PyObject *self, PyObject *args) {
 
     wxPy_END_ALLOW_THREADS;
 }{
-    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
 }
 {
     delete _result;
@@ -929,17 +1004,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetStyle",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetStyle",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetStyle. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -954,17 +1031,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_GetWildcard",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetWildcard",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetWildcard. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -975,7 +1054,7 @@ static PyObject *_wrap_wxFileDialog_GetWildcard(PyObject *self, PyObject *args)
 
     wxPy_END_ALLOW_THREADS;
 }{
-    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
 }
 {
     delete _result;
@@ -984,18 +1063,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","directory", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxFileDialog_SetDirectory",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetDirectory",_kwnames,&_argo0,&_obj1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetDirectory. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -1022,18 +1103,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","setfilename", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxFileDialog_SetFilename",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetFilename",_kwnames,&_argo0,&_obj1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetFilename. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -1060,17 +1143,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","filterIndex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxFileDialog_SetFilterIndex",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFileDialog_SetFilterIndex",_kwnames,&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetFilterIndex. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -1086,18 +1171,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","message", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxFileDialog_SetMessage",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetMessage",_kwnames,&_argo0,&_obj1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetMessage. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -1124,18 +1211,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","path", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxFileDialog_SetPath",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetPath",_kwnames,&_argo0,&_obj1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetPath. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -1162,17 +1251,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","style", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxFileDialog_SetStyle",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxFileDialog_SetStyle",_kwnames,&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetStyle. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -1188,18 +1279,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","wildCard", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxFileDialog_SetWildcard",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetWildcard",_kwnames,&_argo0,&_obj1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetWildcard. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -1226,17 +1319,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFileDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFileDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_ShowModal. Expected _wxFileDialog_p.");
         return NULL;
         }
@@ -1282,12 +1377,12 @@ static void *SwigwxSingleChoiceDialogTowxEvtHandler(void *ptr) {
     return (void *) dest;
 }
 
-static wxSingleChoiceDialog *new_wxSingleChoiceDialog(wxWindow *parent,wxString *message,wxString *caption,int LCOUNT,wxString *LIST,long style,wxPoint *pos) {
+static wxSingleChoiceDialog *new_wxSingleChoiceDialog(wxWindow *parent,wxString *message,wxString *caption,int LCOUNT,wxString *choices,long style,wxPoint *pos) {
             return new wxSingleChoiceDialog(parent, *message, *caption,
-                                            LCOUNT, LIST, NULL, style, *pos);
+                                            LCOUNT, choices, 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;
@@ -1295,20 +1390,23 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args)
     wxString * _arg2;
     int  _arg3;
     wxString * _arg4;
-    long  _arg5 = (wxOK)|(wxCANCEL)|(wxCENTRE);
-    wxPoint * _arg6 = &wxPyDefaultPosition;
-    char * _argc0 = 0;
+    long  _arg5 = (long ) wxOK|wxCANCEL|wxCENTRE;
+    wxPoint * _arg6 = (wxPoint *) &wxPyDefaultPosition;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj4 = 0;
-    char * _argc6 = 0;
+    wxPoint  temp;
+    PyObject * _obj6 = 0;
+    char *_kwnames[] = { "parent","message","caption","choices","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sOOO|ls:new_wxSingleChoiceDialog",&_argc0,&_obj1,&_obj2,&_obj4,&_arg5,&_argc6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO|lO:new_wxSingleChoiceDialog",_kwnames,&_argo0,&_obj1,&_obj2,&_obj4,&_arg5,&_obj6)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSingleChoiceDialog. Expected _wxWindow_p.");
         return NULL;
         }
@@ -1334,12 +1432,12 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args)
         return NULL;
     }
 }
-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(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);
@@ -1353,8 +1451,13 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args)
         _result = (wxSingleChoiceDialog *)new_wxSingleChoiceDialog(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSingleChoiceDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxSingleChoiceDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
 {
     if (_obj1)
         delete _arg1;
@@ -1370,17 +1473,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxSingleChoiceDialog_GetSelection",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSingleChoiceDialog_GetSelection",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSingleChoiceDialog_GetSelection. Expected _wxSingleChoiceDialog_p.");
         return NULL;
         }
@@ -1395,17 +1500,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxSingleChoiceDialog_GetStringSelection",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSingleChoiceDialog_GetStringSelection",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSingleChoiceDialog_GetStringSelection. Expected _wxSingleChoiceDialog_p.");
         return NULL;
         }
@@ -1416,7 +1523,7 @@ static PyObject *_wrap_wxSingleChoiceDialog_GetStringSelection(PyObject *self, P
 
     wxPy_END_ALLOW_THREADS;
 }{
-    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
 }
 {
     delete _result;
@@ -1425,17 +1532,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","sel", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxSingleChoiceDialog_SetSelection",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSingleChoiceDialog_SetSelection",_kwnames,&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSingleChoiceDialog_SetSelection. Expected _wxSingleChoiceDialog_p.");
         return NULL;
         }
@@ -1451,17 +1560,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxSingleChoiceDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSingleChoiceDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSingleChoiceDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSingleChoiceDialog_ShowModal. Expected _wxSingleChoiceDialog_p.");
         return NULL;
         }
@@ -1508,56 +1619,66 @@ 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;
     char * _arg1;
-    char * _arg2 = "Input Text";
-    char * _arg3 = "";
-    long  _arg4 = (wxOK)|(wxCANCEL)|(wxCENTRE);
-    wxPoint * _arg5 = &wxPyDefaultPosition;
-    char * _argc0 = 0;
-    char * _argc5 = 0;
+    char * _arg2 = (char *) "Input Text";
+    char * _arg3 = (char *) "";
+    long  _arg4 = (long ) wxOK|wxCANCEL|wxCENTRE;
+    wxPoint * _arg5 = (wxPoint *) &wxPyDefaultPosition;
+    PyObject * _argo0 = 0;
+    wxPoint  temp;
+    PyObject * _obj5 = 0;
+    char *_kwnames[] = { "parent","message","caption","defaultValue","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss|ssls:new_wxTextEntryDialog",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_argc5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os|sslO:new_wxTextEntryDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_obj5)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxTextEntryDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(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);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextEntryDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextEntryDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
 #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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxTextEntryDialog_GetValue",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextEntryDialog_GetValue",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextEntryDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextEntryDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextEntryDialog_GetValue. Expected _wxTextEntryDialog_p.");
         return NULL;
         }
@@ -1568,7 +1689,7 @@ static PyObject *_wrap_wxTextEntryDialog_GetValue(PyObject *self, PyObject *args
 
     wxPy_END_ALLOW_THREADS;
 }{
-    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
 }
 {
     delete _result;
@@ -1577,18 +1698,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxTextEntryDialog_SetValue",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextEntryDialog_SetValue",_kwnames,&_argo0,&_obj1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextEntryDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextEntryDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextEntryDialog_SetValue. Expected _wxTextEntryDialog_p.");
         return NULL;
         }
@@ -1615,17 +1738,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxTextEntryDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextEntryDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTextEntryDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextEntryDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextEntryDialog_ShowModal. Expected _wxTextEntryDialog_p.");
         return NULL;
         }
@@ -1640,35 +1765,43 @@ 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;
         _result = (wxFontData *)new_wxFontData();
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFontData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFontData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
 #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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxFontData",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxFontData",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxFontData. Expected _wxFontData_p.");
         return NULL;
         }
@@ -1684,18 +1817,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxFontData_EnableEffects",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFontData_EnableEffects",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_EnableEffects. Expected _wxFontData_p.");
         return NULL;
         }
@@ -1712,17 +1847,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFontData_GetAllowSymbols",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetAllowSymbols",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetAllowSymbols. Expected _wxFontData_p.");
         return NULL;
         }
@@ -1737,18 +1874,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFontData_GetColour",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetColour",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetColour. Expected _wxFontData_p.");
         return NULL;
         }
@@ -1759,24 +1898,31 @@ static PyObject *_wrap_wxFontData_GetColour(PyObject *self, PyObject *args) {
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
 #define 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFontData_GetChosenFont",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetChosenFont",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetChosenFont. Expected _wxFontData_p.");
         return NULL;
         }
@@ -1792,17 +1938,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFontData_GetEnableEffects",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetEnableEffects",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetEnableEffects. Expected _wxFontData_p.");
         return NULL;
         }
@@ -1817,18 +1965,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFontData_GetInitialFont",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetInitialFont",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetInitialFont. Expected _wxFontData_p.");
         return NULL;
         }
@@ -1844,17 +1994,19 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFontData_GetShowHelp",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetShowHelp",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_GetShowHelp. Expected _wxFontData_p.");
         return NULL;
         }
@@ -1869,18 +2021,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","allowSymbols", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxFontData_SetAllowSymbols",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFontData_SetAllowSymbols",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetAllowSymbols. Expected _wxFontData_p.");
         return NULL;
         }
@@ -1897,24 +2051,27 @@ 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;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxFontData_SetChosenFont",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontData_SetChosenFont",_kwnames,&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetChosenFont. Expected _wxFontData_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFont_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFontData_SetChosenFont. Expected _wxFont_p.");
         return NULL;
         }
@@ -1930,24 +2087,27 @@ 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;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxFontData_SetColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontData_SetColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetColour. Expected _wxFontData_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFontData_SetColour. Expected _wxColour_p.");
         return NULL;
         }
@@ -1963,24 +2123,27 @@ 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;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxFontData_SetInitialFont",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontData_SetInitialFont",_kwnames,&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetInitialFont. Expected _wxFontData_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFont_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFontData_SetInitialFont. Expected _wxFont_p.");
         return NULL;
         }
@@ -1996,18 +2159,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","min","max", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sii:wxFontData_SetRange",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxFontData_SetRange",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetRange. Expected _wxFontData_p.");
         return NULL;
         }
@@ -2023,18 +2188,20 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","showHelp", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxFontData_SetShowHelp",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFontData_SetShowHelp",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontData_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontData_SetShowHelp. Expected _wxFontData_p.");
         return NULL;
         }
@@ -2083,26 +2250,29 @@ 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 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxFontData * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "parent","data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|s:new_wxFontDialog",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:new_wxFontDialog",_kwnames,&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxFontDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFontData_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFontData_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxFontDialog. Expected _wxFontData_p.");
         return NULL;
         }
@@ -2112,24 +2282,31 @@ static PyObject *_wrap_new_wxFontDialog(PyObject *self, PyObject *args) {
         _result = (wxFontDialog *)new_wxFontDialog(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFontDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFontDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
 #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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFontDialog_GetFontData",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontDialog_GetFontData",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontDialog_GetFontData. Expected _wxFontDialog_p.");
         return NULL;
         }
@@ -2140,23 +2317,30 @@ static PyObject *_wrap_wxFontDialog_GetFontData(PyObject *self, PyObject *args)
     _result = (wxFontData *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFontData_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFontData_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
 #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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFontDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFontDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontDialog_ShowModal. Expected _wxFontDialog_p.");
         return NULL;
         }
@@ -2203,55 +2387,65 @@ 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;
     char * _arg1;
-    char * _arg2 = "Message box";
-    long  _arg3 = (wxOK)|(wxCANCEL)|(wxCENTRE);
-    wxPoint * _arg4 = &wxPyDefaultPosition;
-    char * _argc0 = 0;
-    char * _argc4 = 0;
+    char * _arg2 = (char *) "Message box";
+    long  _arg3 = (long ) wxOK|wxCANCEL|wxCENTRE;
+    wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
+    PyObject * _argo0 = 0;
+    wxPoint  temp;
+    PyObject * _obj4 = 0;
+    char *_kwnames[] = { "parent","message","caption","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss|sls:new_wxMessageDialog",&_argc0,&_arg1,&_arg2,&_arg3,&_argc4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os|slO:new_wxMessageDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_obj4)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMessageDialog. Expected _wxWindow_p.");
         return NULL;
         }
     }
-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(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);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMessageDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMessageDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
 #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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxMessageDialog_ShowModal",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMessageDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMessageDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMessageDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMessageDialog_ShowModal. Expected _wxMessageDialog_p.");
         return NULL;
         }
@@ -2290,21 +2484,22 @@ 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;
     wxString * _arg1;
-    int  _arg2 = 100;
-    wxWindow * _arg3 = NULL;
-    int  _arg4 = (wxPD_AUTO_HIDE)|(wxPD_APP_MODAL);
+    int  _arg2 = (int ) 100;
+    wxWindow * _arg3 = (wxWindow *) NULL;
+    int  _arg4 = (int ) wxPD_AUTO_HIDE|wxPD_APP_MODAL;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;
+    char *_kwnames[] = { "title","message","maximum","parent","style", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|isi:new_wxProgressDialog",&_obj0,&_obj1,&_arg2,&_argc3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iOi:new_wxProgressDialog",_kwnames,&_obj0,&_obj1,&_arg2,&_argo3,&_arg4)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -2320,8 +2515,9 @@ static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args) {
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxWindow_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxProgressDialog. Expected _wxWindow_p.");
         return NULL;
         }
@@ -2331,8 +2527,13 @@ static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args) {
         _result = (wxProgressDialog *)new_wxProgressDialog(*_arg0,*_arg1,_arg2,_arg3,_arg4);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxProgressDialog_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxProgressDialog_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
 {
     if (_obj0)
         delete _arg0;
@@ -2345,19 +2546,21 @@ 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 = -1;
-    char * _arg2 = NULL;
-    char * _argc0 = 0;
+    int  _arg1 = (int ) -1;
+    char * _arg2 = (char *) NULL;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","value","newmsg", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|is:wxProgressDialog_Update",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|is:wxProgressDialog_Update",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxProgressDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxProgressDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxProgressDialog_Update. Expected _wxProgressDialog_p.");
         return NULL;
         }
@@ -2372,16 +2575,18 @@ 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;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxProgressDialog_Resume",&_argc0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxProgressDialog_Resume",_kwnames,&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxProgressDialog_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxProgressDialog_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxProgressDialog_Resume. Expected _wxProgressDialog_p.");
         return NULL;
         }
@@ -2397,465 +2602,549 @@ static PyObject *_wrap_wxProgressDialog_Resume(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef cmndlgscMethods[] = {
-	 { "wxProgressDialog_Resume", _wrap_wxProgressDialog_Resume, 1 },
-	 { "wxProgressDialog_Update", _wrap_wxProgressDialog_Update, 1 },
-	 { "new_wxProgressDialog", _wrap_new_wxProgressDialog, 1 },
-	 { "wxMessageDialog_ShowModal", _wrap_wxMessageDialog_ShowModal, 1 },
-	 { "new_wxMessageDialog", _wrap_new_wxMessageDialog, 1 },
-	 { "wxFontDialog_ShowModal", _wrap_wxFontDialog_ShowModal, 1 },
-	 { "wxFontDialog_GetFontData", _wrap_wxFontDialog_GetFontData, 1 },
-	 { "new_wxFontDialog", _wrap_new_wxFontDialog, 1 },
-	 { "wxFontData_SetShowHelp", _wrap_wxFontData_SetShowHelp, 1 },
-	 { "wxFontData_SetRange", _wrap_wxFontData_SetRange, 1 },
-	 { "wxFontData_SetInitialFont", _wrap_wxFontData_SetInitialFont, 1 },
-	 { "wxFontData_SetColour", _wrap_wxFontData_SetColour, 1 },
-	 { "wxFontData_SetChosenFont", _wrap_wxFontData_SetChosenFont, 1 },
-	 { "wxFontData_SetAllowSymbols", _wrap_wxFontData_SetAllowSymbols, 1 },
-	 { "wxFontData_GetShowHelp", _wrap_wxFontData_GetShowHelp, 1 },
-	 { "wxFontData_GetInitialFont", _wrap_wxFontData_GetInitialFont, 1 },
-	 { "wxFontData_GetEnableEffects", _wrap_wxFontData_GetEnableEffects, 1 },
-	 { "wxFontData_GetChosenFont", _wrap_wxFontData_GetChosenFont, 1 },
-	 { "wxFontData_GetColour", _wrap_wxFontData_GetColour, 1 },
-	 { "wxFontData_GetAllowSymbols", _wrap_wxFontData_GetAllowSymbols, 1 },
-	 { "wxFontData_EnableEffects", _wrap_wxFontData_EnableEffects, 1 },
-	 { "delete_wxFontData", _wrap_delete_wxFontData, 1 },
-	 { "new_wxFontData", _wrap_new_wxFontData, 1 },
-	 { "wxTextEntryDialog_ShowModal", _wrap_wxTextEntryDialog_ShowModal, 1 },
-	 { "wxTextEntryDialog_SetValue", _wrap_wxTextEntryDialog_SetValue, 1 },
-	 { "wxTextEntryDialog_GetValue", _wrap_wxTextEntryDialog_GetValue, 1 },
-	 { "new_wxTextEntryDialog", _wrap_new_wxTextEntryDialog, 1 },
-	 { "wxSingleChoiceDialog_ShowModal", _wrap_wxSingleChoiceDialog_ShowModal, 1 },
-	 { "wxSingleChoiceDialog_SetSelection", _wrap_wxSingleChoiceDialog_SetSelection, 1 },
-	 { "wxSingleChoiceDialog_GetStringSelection", _wrap_wxSingleChoiceDialog_GetStringSelection, 1 },
-	 { "wxSingleChoiceDialog_GetSelection", _wrap_wxSingleChoiceDialog_GetSelection, 1 },
-	 { "new_wxSingleChoiceDialog", _wrap_new_wxSingleChoiceDialog, 1 },
-	 { "wxFileDialog_ShowModal", _wrap_wxFileDialog_ShowModal, 1 },
-	 { "wxFileDialog_SetWildcard", _wrap_wxFileDialog_SetWildcard, 1 },
-	 { "wxFileDialog_SetStyle", _wrap_wxFileDialog_SetStyle, 1 },
-	 { "wxFileDialog_SetPath", _wrap_wxFileDialog_SetPath, 1 },
-	 { "wxFileDialog_SetMessage", _wrap_wxFileDialog_SetMessage, 1 },
-	 { "wxFileDialog_SetFilterIndex", _wrap_wxFileDialog_SetFilterIndex, 1 },
-	 { "wxFileDialog_SetFilename", _wrap_wxFileDialog_SetFilename, 1 },
-	 { "wxFileDialog_SetDirectory", _wrap_wxFileDialog_SetDirectory, 1 },
-	 { "wxFileDialog_GetWildcard", _wrap_wxFileDialog_GetWildcard, 1 },
-	 { "wxFileDialog_GetStyle", _wrap_wxFileDialog_GetStyle, 1 },
-	 { "wxFileDialog_GetPath", _wrap_wxFileDialog_GetPath, 1 },
-	 { "wxFileDialog_GetMessage", _wrap_wxFileDialog_GetMessage, 1 },
-	 { "wxFileDialog_GetFilterIndex", _wrap_wxFileDialog_GetFilterIndex, 1 },
-	 { "wxFileDialog_GetFilename", _wrap_wxFileDialog_GetFilename, 1 },
-	 { "wxFileDialog_GetDirectory", _wrap_wxFileDialog_GetDirectory, 1 },
-	 { "new_wxFileDialog", _wrap_new_wxFileDialog, 1 },
-	 { "wxDirDialog_ShowModal", _wrap_wxDirDialog_ShowModal, 1 },
-	 { "wxDirDialog_SetPath", _wrap_wxDirDialog_SetPath, 1 },
-	 { "wxDirDialog_SetMessage", _wrap_wxDirDialog_SetMessage, 1 },
-	 { "wxDirDialog_GetStyle", _wrap_wxDirDialog_GetStyle, 1 },
-	 { "wxDirDialog_GetMessage", _wrap_wxDirDialog_GetMessage, 1 },
-	 { "wxDirDialog_GetPath", _wrap_wxDirDialog_GetPath, 1 },
-	 { "new_wxDirDialog", _wrap_new_wxDirDialog, 1 },
-	 { "wxColourDialog_ShowModal", _wrap_wxColourDialog_ShowModal, 1 },
-	 { "wxColourDialog_GetColourData", _wrap_wxColourDialog_GetColourData, 1 },
-	 { "new_wxColourDialog", _wrap_new_wxColourDialog, 1 },
-	 { "wxColourData_SetCustomColour", _wrap_wxColourData_SetCustomColour, 1 },
-	 { "wxColourData_SetColour", _wrap_wxColourData_SetColour, 1 },
-	 { "wxColourData_SetChooseFull", _wrap_wxColourData_SetChooseFull, 1 },
-	 { "wxColourData_GetCustomColour", _wrap_wxColourData_GetCustomColour, 1 },
-	 { "wxColourData_GetColour", _wrap_wxColourData_GetColour, 1 },
-	 { "wxColourData_GetChooseFull", _wrap_wxColourData_GetChooseFull, 1 },
-	 { "delete_wxColourData", _wrap_delete_wxColourData, 1 },
-	 { "new_wxColourData", _wrap_new_wxColourData, 1 },
+	 { "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
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_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},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_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},
+    { "_class_wxEvtHandler","_class_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxFontDialog",SwigwxFontDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxFontDialog",SwigwxFontDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxFileDialog",SwigwxFileDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxFileDialog",SwigwxFileDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxDirDialog",SwigwxDirDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxDirDialog",SwigwxDirDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_class_wxColourDialog",SwigwxColourDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxColourDialog",SwigwxColourDialogTowxEvtHandler},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_class_wxToolBarBase","_wxToolBarBase",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_class_wxColourData","_wxColourData",0},
+    { "_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},
+    { "_class_wxStatusBar","_wxStatusBar",0},
+    { "_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel},
+    { "_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel},
+    { "_wxPanel","_class_wxFontDialog",SwigwxFontDialogTowxPanel},
+    { "_wxPanel","_wxFontDialog",SwigwxFontDialogTowxPanel},
+    { "_wxPanel","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel},
+    { "_wxPanel","_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel},
+    { "_wxPanel","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel},
+    { "_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel},
+    { "_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel},
+    { "_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel},
+    { "_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel},
+    { "_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel},
+    { "_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel},
+    { "_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxCheckBox","_class_wxCheckBox",0},
+    { "_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},
+    { "_class_wxDialog","_wxMessageDialog",SwigwxMessageDialogTowxDialog},
+    { "_class_wxDialog","_class_wxFontDialog",SwigwxFontDialogTowxDialog},
+    { "_class_wxDialog","_wxFontDialog",SwigwxFontDialogTowxDialog},
+    { "_class_wxDialog","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog},
+    { "_class_wxDialog","_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog},
+    { "_class_wxDialog","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog},
+    { "_class_wxDialog","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog},
+    { "_class_wxDialog","_class_wxFileDialog",SwigwxFileDialogTowxDialog},
+    { "_class_wxDialog","_wxFileDialog",SwigwxFileDialogTowxDialog},
+    { "_class_wxDialog","_class_wxDirDialog",SwigwxDirDialogTowxDialog},
+    { "_class_wxDialog","_wxDirDialog",SwigwxDirDialogTowxDialog},
+    { "_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},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxButton","_wxButton",0},
+    { "_wxRadioBox","_class_wxRadioBox",0},
+    { "_class_wxFontData","_wxFontData",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_wxScrollBar","_class_wxScrollBar",0},
+    { "_wxSpinButton","_class_wxSpinButton",0},
+    { "_wxColourDialog","_class_wxColourDialog",0},
+    { "_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},
+    { "_wxToolBarSimple","_class_wxToolBarSimple",0},
+    { "_class_wxToolBar","_wxToolBar",0},
+    { "_wxDropTarget","_class_wxDropTarget",0},
+    { "_class_wxStaticLine","_wxStaticLine",0},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_wxToolBarToolBase","_class_wxToolBarToolBase",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},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_class_wxSpinButton","_wxSpinButton",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel},
+    { "_class_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel},
+    { "_class_wxPanel","_class_wxFontDialog",SwigwxFontDialogTowxPanel},
+    { "_class_wxPanel","_wxFontDialog",SwigwxFontDialogTowxPanel},
+    { "_class_wxPanel","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel},
+    { "_class_wxPanel","_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel},
+    { "_class_wxPanel","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel},
+    { "_class_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel},
+    { "_class_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel},
+    { "_class_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel},
+    { "_class_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel},
+    { "_class_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel},
+    { "_class_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel},
+    { "_class_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_class_wxCheckBox","_wxCheckBox",0},
+    { "_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},
+    { "_signed_int","_int",0},
+    { "_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},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_class_wxToolBarSimple","_wxToolBarSimple",0},
+    { "_WXTYPE","_short",0},
+    { "_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},
+    { "_class_wxWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxWindow},
+    { "_class_wxWindow","_wxProgressDialog",SwigwxProgressDialogTowxWindow},
+    { "_class_wxWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxWindow},
+    { "_class_wxWindow","_wxMessageDialog",SwigwxMessageDialogTowxWindow},
+    { "_class_wxWindow","_class_wxFontDialog",SwigwxFontDialogTowxWindow},
+    { "_class_wxWindow","_wxFontDialog",SwigwxFontDialogTowxWindow},
+    { "_class_wxWindow","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow},
+    { "_class_wxWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow},
+    { "_class_wxWindow","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow},
+    { "_class_wxWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow},
+    { "_class_wxWindow","_class_wxFileDialog",SwigwxFileDialogTowxWindow},
+    { "_class_wxWindow","_wxFileDialog",SwigwxFileDialogTowxWindow},
+    { "_class_wxWindow","_class_wxDirDialog",SwigwxDirDialogTowxWindow},
+    { "_class_wxWindow","_wxDirDialog",SwigwxDirDialogTowxWindow},
+    { "_class_wxWindow","_class_wxColourDialog",SwigwxColourDialogTowxWindow},
+    { "_class_wxWindow","_wxColourDialog",SwigwxColourDialogTowxWindow},
+    { "_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},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_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},
+    { "_wxStatusBar","_class_wxStatusBar",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},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxMessageDialog",SwigwxMessageDialogTowxDialog},
+    { "_wxDialog","_wxMessageDialog",SwigwxMessageDialogTowxDialog},
+    { "_wxDialog","_class_wxFontDialog",SwigwxFontDialogTowxDialog},
+    { "_wxDialog","_wxFontDialog",SwigwxFontDialogTowxDialog},
+    { "_wxDialog","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog},
+    { "_wxDialog","_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog},
+    { "_wxDialog","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog},
+    { "_wxDialog","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog},
+    { "_wxDialog","_class_wxFileDialog",SwigwxFileDialogTowxDialog},
+    { "_wxDialog","_wxFileDialog",SwigwxFileDialogTowxDialog},
+    { "_wxDialog","_class_wxDirDialog",SwigwxDirDialogTowxDialog},
+    { "_wxDialog","_wxDirDialog",SwigwxDirDialogTowxDialog},
+    { "_wxDialog","_class_wxColourDialog",SwigwxColourDialogTowxDialog},
+    { "_wxDialog","_wxColourDialog",SwigwxColourDialogTowxDialog},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_class_wxFileDialog","_wxFileDialog",0},
+    { "_short","_WXTYPE",0},
+    { "_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},
+    { "_class_wxSlider","_wxSlider",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_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},
+    { "_wxWindowID","_uint",0},
+    { "_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},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_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},
+    { "_wxToolBarBase","_class_wxToolBarBase",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxControl","_wxControl",0},
+    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_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},
+    { "_wxEvtHandler","_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxFontDialog",SwigwxFontDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxFontDialog",SwigwxFontDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxFileDialog",SwigwxFileDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxFileDialog",SwigwxFileDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxDirDialog",SwigwxDirDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxDirDialog",SwigwxDirDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxColourDialog",SwigwxColourDialogTowxEvtHandler},
+    { "_wxEvtHandler","_wxColourDialog",SwigwxColourDialogTowxEvtHandler},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_class_wxScrollBar","_wxScrollBar",0},
+    { "_class_wxColourDialog","_wxColourDialog",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_class_wxTextEntryDialog","_wxTextEntryDialog",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_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_wxToolBarToolBase","_wxToolBarToolBase",0},
+    { "_class_wxFontDialog","_wxFontDialog",0},
+    { "_wxWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxWindow},
+    { "_wxWindow","_wxProgressDialog",SwigwxProgressDialogTowxWindow},
+    { "_wxWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxWindow},
+    { "_wxWindow","_wxMessageDialog",SwigwxMessageDialogTowxWindow},
+    { "_wxWindow","_class_wxFontDialog",SwigwxFontDialogTowxWindow},
+    { "_wxWindow","_wxFontDialog",SwigwxFontDialogTowxWindow},
+    { "_wxWindow","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow},
+    { "_wxWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow},
+    { "_wxWindow","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow},
+    { "_wxWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow},
+    { "_wxWindow","_class_wxFileDialog",SwigwxFileDialogTowxWindow},
+    { "_wxWindow","_wxFileDialog",SwigwxFileDialogTowxWindow},
+    { "_wxWindow","_class_wxDirDialog",SwigwxDirDialogTowxWindow},
+    { "_wxWindow","_wxDirDialog",SwigwxDirDialogTowxWindow},
+    { "_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},
+{0,0,0}};
+
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
-SWIGEXPORT(void,initcmndlgsc)() {
+SWIGEXPORT(void) initcmndlgsc() {
 	 PyObject *m, *d;
 	 SWIG_globals = SWIG_newvarlink();
 	 m = Py_InitModule("cmndlgsc", cmndlgscMethods);
 	 d = PyModule_GetDict(m);
-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-	 SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-	 SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
-	 SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
-	 SWIG_RegisterMapping("_signed_long","_long",0);
-	 SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-	 SWIG_RegisterMapping("_wxFontData","_class_wxFontData",0);
-	 SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-	 SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxFontDialog",SwigwxFontDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxFontDialog",SwigwxFontDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxFileDialog",SwigwxFileDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxFileDialog",SwigwxFileDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxDirDialog",SwigwxDirDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxDirDialog",SwigwxDirDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxColourDialog",SwigwxColourDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxColourDialog",SwigwxColourDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-	 SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
-	 SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-	 SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-	 SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
-	 SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-	 SWIG_RegisterMapping("_class_wxColourData","_wxColourData",0);
-	 SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-	 SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
-	 SWIG_RegisterMapping("_byte","_unsigned_char",0);
-	 SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
-	 SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
-	 SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
-	 SWIG_RegisterMapping("_long","_wxDash",0);
-	 SWIG_RegisterMapping("_long","_unsigned_long",0);
-	 SWIG_RegisterMapping("_long","_signed_long",0);
-	 SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-	 SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
-	 SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
-	 SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-	 SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
-	 SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-	 SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0);
-	 SWIG_RegisterMapping("_wxProgressDialog","_class_wxProgressDialog",0);
-	 SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
-	 SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-	 SWIG_RegisterMapping("_size_t","_int",0);
-	 SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-	 SWIG_RegisterMapping("_size_t","_uint",0);
-	 SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-	 SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-	 SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-	 SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
-	 SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
-	 SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
-	 SWIG_RegisterMapping("_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_class_wxFontDialog",SwigwxFontDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_wxFontDialog",SwigwxFontDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel);
-	 SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-	 SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
-	 SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
-	 SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
-	 SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
-	 SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-	 SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
-	 SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-	 SWIG_RegisterMapping("_class_wxDialog","_class_wxMessageDialog",SwigwxMessageDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_wxMessageDialog",SwigwxMessageDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_class_wxFontDialog",SwigwxFontDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_wxFontDialog",SwigwxFontDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_class_wxFileDialog",SwigwxFileDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_wxFileDialog",SwigwxFileDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_class_wxDirDialog",SwigwxDirDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_wxDirDialog",SwigwxDirDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_class_wxColourDialog",SwigwxColourDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_wxColourDialog",SwigwxColourDialogTowxDialog);
-	 SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-	 SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
-	 SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
-	 SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
-	 SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
-	 SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-	 SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
-	 SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
-	 SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_uint","_size_t",0);
-	 SWIG_RegisterMapping("_uint","_unsigned_int",0);
-	 SWIG_RegisterMapping("_uint","_int",0);
-	 SWIG_RegisterMapping("_uint","_wxWindowID",0);
-	 SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
-	 SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
-	 SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-	 SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
-	 SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
-	 SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-	 SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
-	 SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
-	 SWIG_RegisterMapping("_class_wxFontData","_wxFontData",0);
-	 SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-	 SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-	 SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-	 SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
-	 SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
-	 SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
-	 SWIG_RegisterMapping("_wxColourDialog","_class_wxColourDialog",0);
-	 SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-	 SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
-	 SWIG_RegisterMapping("_wxMessageDialog","_class_wxMessageDialog",0);
-	 SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
-	 SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0);
-	 SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
-	 SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
-	 SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
-	 SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
-	 SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
-	 SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_EBool","_signed_int",0);
-	 SWIG_RegisterMapping("_EBool","_int",0);
-	 SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-	 SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-	 SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
-	 SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
-	 SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-	 SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
-	 SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-	 SWIG_RegisterMapping("_unsigned_long","_long",0);
-	 SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-	 SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-	 SWIG_RegisterMapping("_class_wxProgressDialog","_wxProgressDialog",0);
-	 SWIG_RegisterMapping("_class_wxDirDialog","_wxDirDialog",0);
-	 SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-	 SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
-	 SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
-	 SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0);
-	 SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-	 SWIG_RegisterMapping("_class_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_class_wxFontDialog",SwigwxFontDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_wxFontDialog",SwigwxFontDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel);
-	 SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-	 SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
-	 SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
-	 SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
-	 SWIG_RegisterMapping("_class_wxMessageDialog","_wxMessageDialog",0);
-	 SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_signed_int","_EBool",0);
-	 SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-	 SWIG_RegisterMapping("_signed_int","_int",0);
-	 SWIG_RegisterMapping("_class_wxTextCtrl","_wxTextCtrl",0);
-	 SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-	 SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-	 SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-	 SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
-	 SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
-	 SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-	 SWIG_RegisterMapping("_WXTYPE","_short",0);
-	 SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-	 SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-	 SWIG_RegisterMapping("_wxFileDialog","_class_wxFileDialog",0);
-	 SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-	 SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-	 SWIG_RegisterMapping("_unsigned_short","_short",0);
-	 SWIG_RegisterMapping("_class_wxWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_wxProgressDialog",SwigwxProgressDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_wxMessageDialog",SwigwxMessageDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_class_wxFontDialog",SwigwxFontDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_wxFontDialog",SwigwxFontDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_class_wxFileDialog",SwigwxFileDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_wxFileDialog",SwigwxFileDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_class_wxDirDialog",SwigwxDirDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_wxDirDialog",SwigwxDirDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_class_wxColourDialog",SwigwxColourDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_wxColourDialog",SwigwxColourDialogTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-	 SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
-	 SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-	 SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
-	 SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
-	 SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-	 SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
-	 SWIG_RegisterMapping("_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0);
-	 SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-	 SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-	 SWIG_RegisterMapping("_class_wxRadioBox","_wxRadioBox",0);
-	 SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-	 SWIG_RegisterMapping("_signed_short","_short",0);
-	 SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-	 SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-	 SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-	 SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
-	 SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
-	 SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
-	 SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
-	 SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-	 SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-	 SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-	 SWIG_RegisterMapping("_unsigned_char","_byte",0);
-	 SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-	 SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-	 SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
-	 SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-	 SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-	 SWIG_RegisterMapping("_unsigned_int","_uint",0);
-	 SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-	 SWIG_RegisterMapping("_unsigned_int","_int",0);
-	 SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-	 SWIG_RegisterMapping("_wxDialog","_class_wxMessageDialog",SwigwxMessageDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_wxMessageDialog",SwigwxMessageDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_class_wxFontDialog",SwigwxFontDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_wxFontDialog",SwigwxFontDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_class_wxFileDialog",SwigwxFileDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_wxFileDialog",SwigwxFileDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_class_wxDirDialog",SwigwxDirDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_wxDirDialog",SwigwxDirDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_class_wxColourDialog",SwigwxColourDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_wxColourDialog",SwigwxColourDialogTowxDialog);
-	 SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-	 SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-	 SWIG_RegisterMapping("_class_wxFileDialog","_wxFileDialog",0);
-	 SWIG_RegisterMapping("_short","_WXTYPE",0);
-	 SWIG_RegisterMapping("_short","_unsigned_short",0);
-	 SWIG_RegisterMapping("_short","_signed_short",0);
-	 SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
-	 SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
-	 SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
-	 SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
-	 SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
-	 SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-	 SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-	 SWIG_RegisterMapping("_wxFrame","_class_wxProgressDialog",SwigwxProgressDialogTowxFrame);
-	 SWIG_RegisterMapping("_wxFrame","_wxProgressDialog",SwigwxProgressDialogTowxFrame);
-	 SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
-	 SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-	 SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-	 SWIG_RegisterMapping("_wxWindowID","_uint",0);
-	 SWIG_RegisterMapping("_wxWindowID","_int",0);
-	 SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-	 SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-	 SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_int","_size_t",0);
-	 SWIG_RegisterMapping("_int","_EBool",0);
-	 SWIG_RegisterMapping("_int","_uint",0);
-	 SWIG_RegisterMapping("_int","_wxWindowID",0);
-	 SWIG_RegisterMapping("_int","_unsigned_int",0);
-	 SWIG_RegisterMapping("_int","_signed_int",0);
-	 SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
-	 SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
-	 SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
-	 SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-	 SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-	 SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-	 SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-	 SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
-	 SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
-	 SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
-	 SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
-	 SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-	 SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-	 SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
-	 SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-	 SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-	 SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-	 SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-	 SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-	 SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
-	 SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-	 SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
-	 SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
-	 SWIG_RegisterMapping("_wxFontDialog","_class_wxFontDialog",0);
-	 SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-	 SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
-	 SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
-	 SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
-	 SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
-	 SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
-	 SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-	 SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
-	 SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-	 SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-	 SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-	 SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-	 SWIG_RegisterMapping("_wxDirDialog","_class_wxDirDialog",0);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_wxProgressDialog",SwigwxProgressDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxFontDialog",SwigwxFontDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_wxFontDialog",SwigwxFontDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxFileDialog",SwigwxFileDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_wxFileDialog",SwigwxFileDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxDirDialog",SwigwxDirDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_wxDirDialog",SwigwxDirDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxColourDialog",SwigwxColourDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_wxColourDialog",SwigwxColourDialogTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-	 SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-	 SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
-	 SWIG_RegisterMapping("_class_wxColourDialog","_wxColourDialog",0);
-	 SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-	 SWIG_RegisterMapping("_wxDash","_long",0);
-	 SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-	 SWIG_RegisterMapping("_class_wxTextEntryDialog","_wxTextEntryDialog",0);
-	 SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
-	 SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
-	 SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0);
-	 SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-	 SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
-	 SWIG_RegisterMapping("_class_wxFontDialog","_wxFontDialog",0);
-	 SWIG_RegisterMapping("_wxWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_wxProgressDialog",SwigwxProgressDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_wxMessageDialog",SwigwxMessageDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_class_wxFontDialog",SwigwxFontDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_wxFontDialog",SwigwxFontDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_class_wxFileDialog",SwigwxFileDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_wxFileDialog",SwigwxFileDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_class_wxDirDialog",SwigwxDirDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_wxDirDialog",SwigwxDirDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_class_wxColourDialog",SwigwxColourDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_wxColourDialog",SwigwxColourDialogTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-	 SWIG_RegisterMapping("_class_wxFrame","_class_wxProgressDialog",SwigwxProgressDialogTowxFrame);
-	 SWIG_RegisterMapping("_class_wxFrame","_wxProgressDialog",SwigwxProgressDialogTowxFrame);
-	 SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}
 }