Fixed "Bound pointer address" error under GCC-2.95

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

diff --git a/utils/wxPython/src/msw/misc.cpp b/utils/wxPython/src/msw/misc.cpp
index 87d46229f40cdbe2f5bc190234815808b5dc2f3a..8daa610a092eda991c9d9178181ca2d689834209 100644 (file)
--- a/utils/wxPython/src/msw/misc.cpp
+++ b/utils/wxPython/src/msw/misc.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 (Patch 6)
  * 
  * 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    initmiscc
 
 #define SWIG_name    "miscc"
@@ -59,12 +59,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);
@@ -81,23 +82,23 @@ 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;
@@ -121,25 +122,42 @@ static char* wxStringErrorMsg = "string type is required for parameter";
         wxGetResource(section, entry, &retval, file);
         return retval;
     }
+
+
+    wxColour wxSystemSettings_GetSystemColour(int index) {
+        return wxSystemSettings::GetSystemColour(index);
+    }
+
+    wxFont wxSystemSettings_GetSystemFont(int index) {
+        return wxSystemSettings::GetSystemFont(index);
+    }
+
+    int wxSystemSettings_GetSystemMetric(int index) {
+        return wxSystemSettings::GetSystemMetric(index);
+    }
+#ifdef __cplusplus
+extern "C" {
+#endif
 static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     char * _arg0;
-    char * _arg1 = NULL;
-    char * _arg2 = NULL;
-    char * _arg3 = NULL;
-    char * _arg4 = "*.*";
-    int  _arg5 = 0;
-    wxWindow * _arg6 = NULL;
-    int  _arg7 = -1;
-    int  _arg8 = -1;
-    char * _argc6 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s|ssssisii:wxFileSelector",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argc6,&_arg7,&_arg8)) 
-        return NULL;
-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxWindow_p")) {
+    char * _arg1 = (char *) NULL;
+    char * _arg2 = (char *) NULL;
+    char * _arg3 = (char *) NULL;
+    char * _arg4 = (char *) "*.*";
+    int  _arg5 = (int ) 0;
+    wxWindow * _arg6 = (wxWindow *) NULL;
+    int  _arg7 = (int ) -1;
+    int  _arg8 = (int ) -1;
+    PyObject * _argo6 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s|ssssiOii:wxFileSelector",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6,&_arg7,&_arg8)) 
+        return NULL;
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxFileSelector. Expected _wxWindow_p.");
         return NULL;
         }
@@ -162,20 +180,20 @@ static PyObject *_wrap_wxGetTextFromUser(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxString * _arg0;
-    wxString * _arg1 = &wxPyEmptyStr;
-    wxString * _arg2 = &wxPyEmptyStr;
-    wxWindow * _arg3 = NULL;
-    int  _arg4 = -1;
-    int  _arg5 = -1;
-    bool  _arg6 = (1);
+    wxString * _arg1 = (wxString *) &wxPyEmptyStr;
+    wxString * _arg2 = (wxString *) &wxPyEmptyStr;
+    wxWindow * _arg3 = (wxWindow *) NULL;
+    int  _arg4 = (int ) -1;
+    int  _arg5 = (int ) -1;
+    bool  _arg6 = (bool ) TRUE;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
-    char * _argc3 = 0;
-    int tempbool6;
+    PyObject * _argo3 = 0;
+    int tempbool6 = (int) TRUE;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|OOsiii:wxGetTextFromUser",&_obj0,&_obj1,&_obj2,&_argc3,&_arg4,&_arg5,&tempbool6)) 
+    if(!PyArg_ParseTuple(args,"O|OOOiii:wxGetTextFromUser",&_obj0,&_obj1,&_obj2,&_argo3,&_arg4,&_arg5,&tempbool6)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -200,8 +218,9 @@ static PyObject *_wrap_wxGetTextFromUser(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
-    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 wxGetTextFromUser. Expected _wxWindow_p.");
         return NULL;
         }
@@ -240,20 +259,20 @@ static PyObject *_wrap_wxGetSingleChoice(PyObject *self, PyObject *args) {
     wxString * _arg1;
     int  _arg2;
     wxString * _arg3;
-    wxWindow * _arg4 = NULL;
-    int  _arg5 = -1;
-    int  _arg6 = -1;
-    bool  _arg7 = (1);
-    int  _arg8 = 150;
-    int  _arg9 = 200;
+    wxWindow * _arg4 = (wxWindow *) NULL;
+    int  _arg5 = (int ) -1;
+    int  _arg6 = (int ) -1;
+    bool  _arg7 = (bool ) TRUE;
+    int  _arg8 = (int ) 150;
+    int  _arg9 = (int ) 200;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj3 = 0;
-    char * _argc4 = 0;
-    int tempbool7;
+    PyObject * _argo4 = 0;
+    int tempbool7 = (int) TRUE;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO|siiiii:wxGetSingleChoice",&_obj0,&_obj1,&_obj3,&_argc4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) 
+    if(!PyArg_ParseTuple(args,"OOO|Oiiiii:wxGetSingleChoice",&_obj0,&_obj1,&_obj3,&_argo4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -276,8 +295,9 @@ static PyObject *_wrap_wxGetSingleChoice(PyObject *self, PyObject *args) {
         return NULL;
     }
 }
-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxWindow_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxGetSingleChoice. Expected _wxWindow_p.");
         return NULL;
         }
@@ -323,20 +343,20 @@ static PyObject *_wrap_wxGetSingleChoiceIndex(PyObject *self, PyObject *args) {
     wxString * _arg1;
     int  _arg2;
     wxString * _arg3;
-    wxWindow * _arg4 = NULL;
-    int  _arg5 = -1;
-    int  _arg6 = -1;
-    bool  _arg7 = (1);
-    int  _arg8 = 150;
-    int  _arg9 = 200;
+    wxWindow * _arg4 = (wxWindow *) NULL;
+    int  _arg5 = (int ) -1;
+    int  _arg6 = (int ) -1;
+    bool  _arg7 = (bool ) TRUE;
+    int  _arg8 = (int ) 150;
+    int  _arg9 = (int ) 200;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj3 = 0;
-    char * _argc4 = 0;
-    int tempbool7;
+    PyObject * _argo4 = 0;
+    int tempbool7 = (int) TRUE;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO|siiiii:wxGetSingleChoiceIndex",&_obj0,&_obj1,&_obj3,&_argc4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) 
+    if(!PyArg_ParseTuple(args,"OOO|Oiiiii:wxGetSingleChoiceIndex",&_obj0,&_obj1,&_obj3,&_argo4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -359,8 +379,9 @@ static PyObject *_wrap_wxGetSingleChoiceIndex(PyObject *self, PyObject *args) {
         return NULL;
     }
 }
-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxWindow_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxGetSingleChoiceIndex. Expected _wxWindow_p.");
         return NULL;
         }
@@ -398,17 +419,17 @@ static PyObject *_wrap_wxMessageBox(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxString * _arg0;
-    wxString * _arg1 = &wxPyEmptyStr;
-    int  _arg2 = (wxOK)|(wxCENTRE);
-    wxWindow * _arg3 = NULL;
-    int  _arg4 = -1;
-    int  _arg5 = -1;
+    wxString * _arg1 = (wxString *) &wxPyEmptyStr;
+    int  _arg2 = (int ) wxOK|wxCENTRE;
+    wxWindow * _arg3 = (wxWindow *) NULL;
+    int  _arg4 = (int ) -1;
+    int  _arg5 = (int ) -1;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|Oisii:wxMessageBox",&_obj0,&_obj1,&_arg2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"O|OiOii:wxMessageBox",&_obj0,&_obj1,&_arg2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -425,8 +446,9 @@ static PyObject *_wrap_wxMessageBox(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 wxMessageBox. Expected _wxWindow_p.");
         return NULL;
         }
@@ -448,6 +470,82 @@ static PyObject *_wrap_wxMessageBox(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+static PyObject *_wrap_wxGetNumberFromUser(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxString * _arg0;
+    wxString * _arg1;
+    wxString * _arg2;
+    long  _arg3;
+    long  _arg4 = (long ) 0;
+    long  _arg5 = (long ) 100;
+    wxWindow * _arg6 = (wxWindow *) NULL;
+    wxPoint * _arg7 = (wxPoint *) &wxPyDefaultPosition;
+    PyObject * _obj0 = 0;
+    PyObject * _obj1 = 0;
+    PyObject * _obj2 = 0;
+    PyObject * _argo6 = 0;
+    PyObject * _argo7 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"OOOl|llOO:wxGetNumberFromUser",&_obj0,&_obj1,&_obj2,&_arg3,&_arg4,&_arg5,&_argo6,&_argo7)) 
+        return NULL;
+{
+    if (!PyString_Check(_obj0)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
+}
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+}
+{
+    if (!PyString_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
+}
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxGetNumberFromUser. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argo7) {
+        if (_argo7 == Py_None) { _arg7 = NULL; }
+        else if (SWIG_GetPtrObj(_argo7,(void **) &_arg7,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of wxGetNumberFromUser. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (long )wxGetNumberFromUser(*_arg0,*_arg1,*_arg2,_arg3,_arg4,_arg5,_arg6,*_arg7);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("l",_result);
+{
+    if (_obj0)
+        delete _arg0;
+}
+{
+    if (_obj1)
+        delete _arg1;
+}
+{
+    if (_obj2)
+        delete _arg2;
+}
+    return _resultobj;
+}
+
 static PyObject *_wrap_wxColourDisplay(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
@@ -483,13 +581,14 @@ static PyObject *_wrap_wxDisplayDepth(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxSetCursor(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxCursor * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxSetCursor",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSetCursor",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCursor_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSetCursor. Expected _wxCursor_p.");
         return NULL;
         }
@@ -572,14 +671,15 @@ static PyObject *_wrap_RegisterId(PyObject *self, PyObject *args) {
 
 static PyObject *_wrap_wxBeginBusyCursor(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
-    wxCursor * _arg0 = wxHOURGLASS_CURSOR;
-    char * _argc0 = 0;
+    wxCursor * _arg0 = (wxCursor *) wxHOURGLASS_CURSOR;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|s:wxBeginBusyCursor",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"|O:wxBeginBusyCursor",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCursor_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBeginBusyCursor. Expected _wxCursor_p.");
         return NULL;
         }
@@ -666,9 +766,9 @@ static PyObject *_wrap_wxExecute(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxString * _arg0;
-    bool  _arg1 = (0);
+    bool  _arg1 = (bool ) FALSE;
     PyObject * _obj0 = 0;
-    int tempbool1;
+    int tempbool1 = (int) FALSE;
 
     self = self;
     if(!PyArg_ParseTuple(args,"O|i:wxExecute",&_obj0,&tempbool1)) 
@@ -707,16 +807,21 @@ static PyObject *_wrap_wxGetActiveWindow(PyObject *self, PyObject *args) {
         _result = (wxWindow *)wxGetActiveWindow();
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
 static PyObject *_wrap_wxGetElapsedTime(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
-    bool  _arg0 = (1);
-    int tempbool0;
+    bool  _arg0 = (bool ) TRUE;
+    int tempbool0 = (int) TRUE;
 
     self = self;
     if(!PyArg_ParseTuple(args,"|i:wxGetElapsedTime",&tempbool0)) 
@@ -823,7 +928,7 @@ static PyObject *_wrap_wxNow(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxShell(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
-    wxString * _arg0 = &wxPyEmptyStr;
+    wxString * _arg0 = (wxString *) &wxPyEmptyStr;
     PyObject * _obj0 = 0;
 
     self = self;
@@ -975,7 +1080,7 @@ static PyObject *_wrap_wxGetResource(PyObject *self, PyObject *args) {
     char * _result;
     char * _arg0;
     char * _arg1;
-    char * _arg2 = NULL;
+    char * _arg2 = (char *) NULL;
 
     self = self;
     if(!PyArg_ParseTuple(args,"ss|s:wxGetResource",&_arg0,&_arg1,&_arg2)) 
@@ -1075,8 +1180,13 @@ static PyObject *_wrap_wxResourceCreateMenuBar(PyObject *self, PyObject *args) {
         _result = (wxMenuBar *)wxResourceCreateMenuBar(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -1101,14 +1211,15 @@ static PyObject *_wrap_wxResourceParseData(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     char * _arg0;
-    wxResourceTable * _arg1 = NULL;
-    char * _argc1 = 0;
+    wxResourceTable * _arg1 = (wxResourceTable *) NULL;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|s:wxResourceParseData",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"s|O:wxResourceParseData",&_arg0,&_argo1)) 
         return NULL;
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxResourceTable_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxResourceTable_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxResourceParseData. Expected _wxResourceTable_p.");
         return NULL;
         }
@@ -1126,14 +1237,15 @@ static PyObject *_wrap_wxResourceParseFile(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     char * _arg0;
-    wxResourceTable * _arg1 = NULL;
-    char * _argc1 = 0;
+    wxResourceTable * _arg1 = (wxResourceTable *) NULL;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|s:wxResourceParseFile",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"s|O:wxResourceParseFile",&_arg0,&_argo1)) 
         return NULL;
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxResourceTable_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxResourceTable_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxResourceParseFile. Expected _wxResourceTable_p.");
         return NULL;
         }
@@ -1151,14 +1263,15 @@ static PyObject *_wrap_wxResourceParseString(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     char * _arg0;
-    wxResourceTable * _arg1 = NULL;
-    char * _argc1 = 0;
+    wxResourceTable * _arg1 = (wxResourceTable *) NULL;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|s:wxResourceParseString",&_arg0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"s|O:wxResourceParseString",&_arg0,&_argo1)) 
         return NULL;
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxResourceTable_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxResourceTable_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxResourceParseString. Expected _wxResourceTable_p.");
         return NULL;
         }
@@ -1172,19 +1285,75 @@ static PyObject *_wrap_wxResourceParseString(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+static PyObject *_wrap_wxSystemSettings_GetSystemColour(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxColour * _result;
+    int  _arg0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"i:wxSystemSettings_GetSystemColour",&_arg0)) 
+        return NULL;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxColour (wxSystemSettings_GetSystemColour(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+static PyObject *_wrap_wxSystemSettings_GetSystemFont(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxFont * _result;
+    int  _arg0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"i:wxSystemSettings_GetSystemFont",&_arg0)) 
+        return NULL;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxFont (wxSystemSettings_GetSystemFont(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+static PyObject *_wrap_wxSystemSettings_GetSystemMetric(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    int  _arg0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"i:wxSystemSettings_GetSystemMetric",&_arg0)) 
+        return NULL;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxSystemSettings_GetSystemMetric(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 #define wxSize_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval)
 static PyObject *_wrap_wxSize_x_set(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxSize_x_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxSize_x_set",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_x_set. Expected _wxSize_p.");
         return NULL;
         }
@@ -1203,13 +1372,14 @@ static PyObject *_wrap_wxSize_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxSize_x_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_x_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_x_get. Expected _wxSize_p.");
         return NULL;
         }
@@ -1229,13 +1399,14 @@ static PyObject *_wrap_wxSize_y_set(PyObject *self, PyObject *args) {
     long  _result;
     wxSize * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxSize_y_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxSize_y_set",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_y_set. Expected _wxSize_p.");
         return NULL;
         }
@@ -1254,13 +1425,14 @@ static PyObject *_wrap_wxSize_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxSize_y_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_y_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_y_get. Expected _wxSize_p.");
         return NULL;
         }
@@ -1278,8 +1450,8 @@ static PyObject *_wrap_wxSize_y_get(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _result;
-    long  _arg0 = 0;
-    long  _arg1 = 0;
+    long  _arg0 = (long ) 0;
+    long  _arg1 = (long ) 0;
     char _ptemp[128];
 
     self = self;
@@ -1290,8 +1462,13 @@ static PyObject *_wrap_new_wxSize(PyObject *self, PyObject *args) {
         _result = (wxSize *)new_wxSize(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSize_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxSize_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -1299,13 +1476,14 @@ static PyObject *_wrap_new_wxSize(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxSize",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxSize. Expected _wxSize_p.");
         return NULL;
         }
@@ -1326,13 +1504,14 @@ static PyObject *_wrap_wxSize_Set(PyObject *self, PyObject *args) {
     wxSize * _arg0;
     long  _arg1;
     long  _arg2;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sll:wxSize_Set",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxSize_Set",&_argo0,&_arg1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_Set. Expected _wxSize_p.");
         return NULL;
         }
@@ -1352,13 +1531,14 @@ static PyObject *_wrap_wxSize_GetX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxSize_GetX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_GetX",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetX. Expected _wxSize_p.");
         return NULL;
         }
@@ -1377,13 +1557,14 @@ static PyObject *_wrap_wxSize_GetY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxSize_GetY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_GetY",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetY. Expected _wxSize_p.");
         return NULL;
         }
@@ -1402,13 +1583,14 @@ static PyObject *_wrap_wxSize_GetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxSize_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_GetWidth",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetWidth. Expected _wxSize_p.");
         return NULL;
         }
@@ -1427,13 +1609,14 @@ static PyObject *_wrap_wxSize_GetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxSize_GetHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_GetHeight",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetHeight. Expected _wxSize_p.");
         return NULL;
         }
@@ -1452,13 +1635,14 @@ static PyObject *_wrap_wxSize_SetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxSize_SetWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxSize_SetWidth",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_SetWidth. Expected _wxSize_p.");
         return NULL;
         }
@@ -1478,13 +1662,14 @@ static PyObject *_wrap_wxSize_SetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxSize_SetHeight",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxSize_SetHeight",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_SetHeight. Expected _wxSize_p.");
         return NULL;
         }
@@ -1509,13 +1694,14 @@ static PyObject *_wrap_wxSize_asTuple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxSize * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxSize_asTuple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxSize_asTuple",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_asTuple. Expected _wxSize_p.");
         return NULL;
         }
@@ -1537,13 +1723,14 @@ static PyObject *_wrap_wxRealPoint_x_set(PyObject *self, PyObject *args) {
     double  _result;
     wxRealPoint * _arg0;
     double  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sd:wxRealPoint_x_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Od:wxRealPoint_x_set",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRealPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_x_set. Expected _wxRealPoint_p.");
         return NULL;
         }
@@ -1562,13 +1749,14 @@ static PyObject *_wrap_wxRealPoint_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     double  _result;
     wxRealPoint * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRealPoint_x_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRealPoint_x_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRealPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_x_get. Expected _wxRealPoint_p.");
         return NULL;
         }
@@ -1588,13 +1776,14 @@ static PyObject *_wrap_wxRealPoint_y_set(PyObject *self, PyObject *args) {
     double  _result;
     wxRealPoint * _arg0;
     double  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sd:wxRealPoint_y_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Od:wxRealPoint_y_set",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRealPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_y_set. Expected _wxRealPoint_p.");
         return NULL;
         }
@@ -1613,13 +1802,14 @@ static PyObject *_wrap_wxRealPoint_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     double  _result;
     wxRealPoint * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRealPoint_y_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRealPoint_y_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRealPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_y_get. Expected _wxRealPoint_p.");
         return NULL;
         }
@@ -1637,8 +1827,8 @@ static PyObject *_wrap_wxRealPoint_y_get(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxRealPoint(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRealPoint * _result;
-    double  _arg0 = 0.0;
-    double  _arg1 = 0.0;
+    double  _arg0 = (double ) 0.0;
+    double  _arg1 = (double ) 0.0;
     char _ptemp[128];
 
     self = self;
@@ -1649,8 +1839,13 @@ static PyObject *_wrap_new_wxRealPoint(PyObject *self, PyObject *args) {
         _result = (wxRealPoint *)new_wxRealPoint(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRealPoint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxRealPoint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -1658,13 +1853,14 @@ static PyObject *_wrap_new_wxRealPoint(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxRealPoint(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRealPoint * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxRealPoint",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxRealPoint",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRealPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRealPoint. Expected _wxRealPoint_p.");
         return NULL;
         }
@@ -1685,13 +1881,14 @@ static PyObject *_wrap_wxPoint_x_set(PyObject *self, PyObject *args) {
     long  _result;
     wxPoint * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxPoint_x_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxPoint_x_set",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_x_set. Expected _wxPoint_p.");
         return NULL;
         }
@@ -1710,13 +1907,14 @@ static PyObject *_wrap_wxPoint_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxPoint * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxPoint_x_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPoint_x_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_x_get. Expected _wxPoint_p.");
         return NULL;
         }
@@ -1736,13 +1934,14 @@ static PyObject *_wrap_wxPoint_y_set(PyObject *self, PyObject *args) {
     long  _result;
     wxPoint * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxPoint_y_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxPoint_y_set",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_y_set. Expected _wxPoint_p.");
         return NULL;
         }
@@ -1761,13 +1960,14 @@ static PyObject *_wrap_wxPoint_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxPoint * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxPoint_y_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPoint_y_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_y_get. Expected _wxPoint_p.");
         return NULL;
         }
@@ -1785,8 +1985,8 @@ static PyObject *_wrap_wxPoint_y_get(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxPoint(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPoint * _result;
-    long  _arg0 = 0;
-    long  _arg1 = 0;
+    long  _arg0 = (long ) 0;
+    long  _arg1 = (long ) 0;
     char _ptemp[128];
 
     self = self;
@@ -1797,8 +1997,13 @@ static PyObject *_wrap_new_wxPoint(PyObject *self, PyObject *args) {
         _result = (wxPoint *)new_wxPoint(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -1806,13 +2011,14 @@ static PyObject *_wrap_new_wxPoint(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxPoint(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPoint * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxPoint",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxPoint",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPoint. Expected _wxPoint_p.");
         return NULL;
         }
@@ -1836,13 +2042,14 @@ static PyObject *_wrap_wxPoint_Set(PyObject *self, PyObject *args) {
     wxPoint * _arg0;
     long  _arg1;
     long  _arg2;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sll:wxPoint_Set",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxPoint_Set",&_argo0,&_arg1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_Set. Expected _wxPoint_p.");
         return NULL;
         }
@@ -1867,13 +2074,14 @@ static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxPoint * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxPoint_asTuple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPoint_asTuple",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_asTuple. Expected _wxPoint_p.");
         return NULL;
         }
@@ -1893,10 +2101,10 @@ static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _result;
-    long  _arg0 = 0;
-    long  _arg1 = 0;
-    long  _arg2 = 0;
-    long  _arg3 = 0;
+    long  _arg0 = (long ) 0;
+    long  _arg1 = (long ) 0;
+    long  _arg2 = (long ) 0;
+    long  _arg3 = (long ) 0;
     char _ptemp[128];
 
     self = self;
@@ -1907,8 +2115,13 @@ static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args) {
         _result = (wxRect *)new_wxRect(_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -1916,13 +2129,14 @@ static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxRect(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxRect",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxRect",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRect. Expected _wxRect_p.");
         return NULL;
         }
@@ -1942,13 +2156,14 @@ static PyObject *_wrap_wxRect_GetX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_GetX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetX",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetX. Expected _wxRect_p.");
         return NULL;
         }
@@ -1967,13 +2182,14 @@ static PyObject *_wrap_wxRect_SetX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxRect_SetX",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_SetX",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetX. Expected _wxRect_p.");
         return NULL;
         }
@@ -1993,13 +2209,14 @@ static PyObject *_wrap_wxRect_GetY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_GetY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetY",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetY. Expected _wxRect_p.");
         return NULL;
         }
@@ -2018,13 +2235,14 @@ static PyObject *_wrap_wxRect_SetY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxRect_SetY",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_SetY",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetY. Expected _wxRect_p.");
         return NULL;
         }
@@ -2044,13 +2262,14 @@ static PyObject *_wrap_wxRect_GetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetWidth",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetWidth. Expected _wxRect_p.");
         return NULL;
         }
@@ -2069,13 +2288,14 @@ static PyObject *_wrap_wxRect_SetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxRect_SetWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_SetWidth",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetWidth. Expected _wxRect_p.");
         return NULL;
         }
@@ -2095,13 +2315,14 @@ static PyObject *_wrap_wxRect_GetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_GetHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetHeight",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetHeight. Expected _wxRect_p.");
         return NULL;
         }
@@ -2120,13 +2341,14 @@ static PyObject *_wrap_wxRect_SetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxRect_SetHeight",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_SetHeight",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetHeight. Expected _wxRect_p.");
         return NULL;
         }
@@ -2146,14 +2368,15 @@ static PyObject *_wrap_wxRect_GetPosition(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_GetPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetPosition",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetPosition. Expected _wxRect_p.");
         return NULL;
         }
@@ -2173,14 +2396,15 @@ static PyObject *_wrap_wxRect_GetSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxSize * _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_GetSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetSize",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetSize. Expected _wxRect_p.");
         return NULL;
         }
@@ -2200,13 +2424,14 @@ static PyObject *_wrap_wxRect_GetLeft(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_GetLeft",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetLeft",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetLeft. Expected _wxRect_p.");
         return NULL;
         }
@@ -2225,13 +2450,14 @@ static PyObject *_wrap_wxRect_GetTop(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_GetTop",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetTop",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetTop. Expected _wxRect_p.");
         return NULL;
         }
@@ -2250,13 +2476,14 @@ static PyObject *_wrap_wxRect_GetBottom(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_GetBottom",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetBottom",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetBottom. Expected _wxRect_p.");
         return NULL;
         }
@@ -2275,13 +2502,14 @@ static PyObject *_wrap_wxRect_GetRight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_GetRight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_GetRight",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetRight. Expected _wxRect_p.");
         return NULL;
         }
@@ -2301,13 +2529,14 @@ static PyObject *_wrap_wxRect_x_set(PyObject *self, PyObject *args) {
     long  _result;
     wxRect * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxRect_x_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_x_set",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_x_set. Expected _wxRect_p.");
         return NULL;
         }
@@ -2326,13 +2555,14 @@ static PyObject *_wrap_wxRect_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_x_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_x_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_x_get. Expected _wxRect_p.");
         return NULL;
         }
@@ -2352,13 +2582,14 @@ static PyObject *_wrap_wxRect_y_set(PyObject *self, PyObject *args) {
     long  _result;
     wxRect * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxRect_y_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_y_set",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_y_set. Expected _wxRect_p.");
         return NULL;
         }
@@ -2377,13 +2608,14 @@ static PyObject *_wrap_wxRect_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_y_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_y_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_y_get. Expected _wxRect_p.");
         return NULL;
         }
@@ -2403,13 +2635,14 @@ static PyObject *_wrap_wxRect_width_set(PyObject *self, PyObject *args) {
     long  _result;
     wxRect * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxRect_width_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_width_set",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_width_set. Expected _wxRect_p.");
         return NULL;
         }
@@ -2428,13 +2661,14 @@ static PyObject *_wrap_wxRect_width_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_width_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_width_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_width_get. Expected _wxRect_p.");
         return NULL;
         }
@@ -2454,13 +2688,14 @@ static PyObject *_wrap_wxRect_height_set(PyObject *self, PyObject *args) {
     long  _result;
     wxRect * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxRect_height_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxRect_height_set",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_height_set. Expected _wxRect_p.");
         return NULL;
         }
@@ -2479,13 +2714,14 @@ static PyObject *_wrap_wxRect_height_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_height_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_height_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_height_get. Expected _wxRect_p.");
         return NULL;
         }
@@ -2511,13 +2747,14 @@ static PyObject *_wrap_wxRect_asTuple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxRect * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRect_asTuple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRect_asTuple",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_asTuple. Expected _wxRect_p.");
         return NULL;
         }
@@ -2552,8 +2789,13 @@ static PyObject *_wrap_new_wxPyTimer(PyObject *self, PyObject *args) {
         _result = (wxPyTimer *)new_wxPyTimer(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyTimer_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyTimer_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -2561,13 +2803,14 @@ static PyObject *_wrap_new_wxPyTimer(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxPyTimer(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyTimer * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxPyTimer",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxPyTimer",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyTimer_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTimer_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPyTimer. Expected _wxPyTimer_p.");
         return NULL;
         }
@@ -2587,13 +2830,14 @@ static PyObject *_wrap_wxPyTimer_Interval(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPyTimer * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxPyTimer_Interval",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyTimer_Interval",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyTimer_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTimer_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyTimer_Interval. Expected _wxPyTimer_p.");
         return NULL;
         }
@@ -2611,15 +2855,16 @@ static PyObject *_wrap_wxPyTimer_Interval(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxPyTimer_Start(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyTimer * _arg0;
-    int  _arg1 = -1;
-    int  _arg2 = (0);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) -1;
+    int  _arg2 = (int ) FALSE;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|ii:wxPyTimer_Start",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"O|ii:wxPyTimer_Start",&_argo0,&_arg1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyTimer_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTimer_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyTimer_Start. Expected _wxPyTimer_p.");
         return NULL;
         }
@@ -2638,13 +2883,14 @@ static PyObject *_wrap_wxPyTimer_Start(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxPyTimer_Stop(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPyTimer * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxPyTimer_Stop",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPyTimer_Stop",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyTimer_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTimer_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyTimer_Stop. Expected _wxPyTimer_p.");
         return NULL;
         }
@@ -2664,21 +2910,23 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Above(PyObject *self, PyObje
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
-    int  _arg2 = 0;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    int  _arg2 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss|i:wxIndividualLayoutConstraint_Above",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxIndividualLayoutConstraint_Above",&_argo0,&_argo1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Above. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_Above. Expected _wxWindow_p.");
         return NULL;
         }
@@ -2698,13 +2946,14 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Absolute(PyObject *self, PyO
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxIndividualLayoutConstraint_Absolute",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxIndividualLayoutConstraint_Absolute",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Absolute. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
@@ -2723,13 +2972,14 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Absolute(PyObject *self, PyO
 static PyObject *_wrap_wxIndividualLayoutConstraint_AsIs(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxIndividualLayoutConstraint_AsIs",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxIndividualLayoutConstraint_AsIs",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_AsIs. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
@@ -2749,21 +2999,23 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Below(PyObject *self, PyObje
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
-    int  _arg2 = 0;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    int  _arg2 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss|i:wxIndividualLayoutConstraint_Below",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxIndividualLayoutConstraint_Below",&_argo0,&_argo1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Below. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_Below. Expected _wxWindow_p.");
         return NULL;
         }
@@ -2782,13 +3034,14 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Below(PyObject *self, PyObje
 static PyObject *_wrap_wxIndividualLayoutConstraint_Unconstrained(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxIndividualLayoutConstraint_Unconstrained",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxIndividualLayoutConstraint_Unconstrained",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Unconstrained. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
@@ -2808,21 +3061,23 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_LeftOf(PyObject *self, PyObj
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
-    int  _arg2 = 0;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    int  _arg2 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss|i:wxIndividualLayoutConstraint_LeftOf",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxIndividualLayoutConstraint_LeftOf",&_argo0,&_argo1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_LeftOf. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_LeftOf. Expected _wxWindow_p.");
         return NULL;
         }
@@ -2844,20 +3099,22 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_PercentOf(PyObject *self, Py
     wxWindow * _arg1;
     wxEdge  _arg2;
     int  _arg3;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ssii:wxIndividualLayoutConstraint_PercentOf",&_argc0,&_argc1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOii:wxIndividualLayoutConstraint_PercentOf",&_argo0,&_argo1,&_arg2,&_arg3)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_PercentOf. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_PercentOf. Expected _wxWindow_p.");
         return NULL;
         }
@@ -2877,21 +3134,23 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_RightOf(PyObject *self, PyOb
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
-    int  _arg2 = 0;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    int  _arg2 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss|i:wxIndividualLayoutConstraint_RightOf",&_argc0,&_argc1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OO|i:wxIndividualLayoutConstraint_RightOf",&_argo0,&_argo1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_RightOf. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_RightOf. Expected _wxWindow_p.");
         return NULL;
         }
@@ -2912,21 +3171,23 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SameAs(PyObject *self, PyObj
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
     wxEdge  _arg2;
-    int  _arg3 = 0;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    int  _arg3 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ssi|i:wxIndividualLayoutConstraint_SameAs",&_argc0,&_argc1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOi|i:wxIndividualLayoutConstraint_SameAs",&_argo0,&_argo1,&_arg2,&_arg3)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_SameAs. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxIndividualLayoutConstraint_SameAs. Expected _wxWindow_p.");
         return NULL;
         }
@@ -2948,22 +3209,24 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Set(PyObject *self, PyObject
     wxRelationship  _arg1;
     wxWindow * _arg2;
     wxEdge  _arg3;
-    int  _arg4 = 0;
-    int  _arg5 = 0;
-    char * _argc0 = 0;
-    char * _argc2 = 0;
+    int  _arg4 = (int ) 0;
+    int  _arg5 = (int ) 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sisi|ii:wxIndividualLayoutConstraint_Set",&_argc0,&_arg1,&_argc2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"OiOi|ii:wxIndividualLayoutConstraint_Set",&_argo0,&_arg1,&_argo2,&_arg3,&_arg4,&_arg5)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIndividualLayoutConstraint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIndividualLayoutConstraint_Set. Expected _wxIndividualLayoutConstraint_p.");
         return NULL;
         }
     }
-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxWindow_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxIndividualLayoutConstraint_Set. Expected _wxWindow_p.");
         return NULL;
         }
@@ -2992,8 +3255,13 @@ static PyObject *_wrap_new_wxLayoutConstraints(PyObject *self, PyObject *args) {
         _result = (wxLayoutConstraints *)new_wxLayoutConstraints();
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutConstraints_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutConstraints_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3002,14 +3270,15 @@ static PyObject *_wrap_wxLayoutConstraints_bottom_get(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_bottom_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_bottom_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_bottom_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
@@ -3019,8 +3288,13 @@ static PyObject *_wrap_wxLayoutConstraints_bottom_get(PyObject *self, PyObject *
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_bottom_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3029,14 +3303,15 @@ static PyObject *_wrap_wxLayoutConstraints_centreX_get(PyObject *self, PyObject
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_centreX_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_centreX_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_centreX_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
@@ -3046,8 +3321,13 @@ static PyObject *_wrap_wxLayoutConstraints_centreX_get(PyObject *self, PyObject
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_centreX_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3056,14 +3336,15 @@ static PyObject *_wrap_wxLayoutConstraints_centreY_get(PyObject *self, PyObject
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_centreY_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_centreY_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_centreY_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
@@ -3073,8 +3354,13 @@ static PyObject *_wrap_wxLayoutConstraints_centreY_get(PyObject *self, PyObject
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_centreY_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3083,14 +3369,15 @@ static PyObject *_wrap_wxLayoutConstraints_height_get(PyObject *self, PyObject *
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_height_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_height_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_height_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
@@ -3100,8 +3387,13 @@ static PyObject *_wrap_wxLayoutConstraints_height_get(PyObject *self, PyObject *
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_height_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3110,14 +3402,15 @@ static PyObject *_wrap_wxLayoutConstraints_left_get(PyObject *self, PyObject *ar
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_left_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_left_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_left_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
@@ -3127,8 +3420,13 @@ static PyObject *_wrap_wxLayoutConstraints_left_get(PyObject *self, PyObject *ar
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_left_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3137,14 +3435,15 @@ static PyObject *_wrap_wxLayoutConstraints_right_get(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_right_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_right_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_right_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
@@ -3154,8 +3453,13 @@ static PyObject *_wrap_wxLayoutConstraints_right_get(PyObject *self, PyObject *a
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_right_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3164,14 +3468,15 @@ static PyObject *_wrap_wxLayoutConstraints_top_get(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_top_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_top_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_top_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
@@ -3181,8 +3486,13 @@ static PyObject *_wrap_wxLayoutConstraints_top_get(PyObject *self, PyObject *arg
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_top_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3191,14 +3501,15 @@ static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *self, PyObject *a
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxLayoutConstraints_width_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_width_get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLayoutConstraints_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutConstraints_width_get. Expected _wxLayoutConstraints_p.");
         return NULL;
         }
@@ -3208,8 +3519,13 @@ static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *self, PyObject *a
         _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_width_get(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3227,8 +3543,13 @@ static PyObject *_wrap_new_wxRegion(PyObject *self, PyObject *args) {
         _result = (wxRegion *)new_wxRegion();
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRegion_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxRegion_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3236,13 +3557,14 @@ static PyObject *_wrap_new_wxRegion(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxRegion(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegion * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxRegion",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxRegion",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRegion. Expected _wxRegion_p.");
         return NULL;
         }
@@ -3261,13 +3583,14 @@ static PyObject *_wrap_delete_wxRegion(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxRegion_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegion * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRegion_Clear",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegion_Clear",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Clear. Expected _wxRegion_p.");
         return NULL;
         }
@@ -3289,13 +3612,14 @@ static PyObject *_wrap_wxRegion_Contains(PyObject *self, PyObject *args) {
     wxRegion * _arg0;
     long  _arg1;
     long  _arg2;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sll:wxRegion_Contains",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxRegion_Contains",&_argo0,&_arg1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Contains. Expected _wxRegion_p.");
         return NULL;
         }
@@ -3315,20 +3639,22 @@ static PyObject *_wrap_wxRegion_ContainsPoint(PyObject *self, PyObject *args) {
     wxRegionContain  _result;
     wxRegion * _arg0;
     wxPoint * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxRegion_ContainsPoint",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRegion_ContainsPoint",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_ContainsPoint. Expected _wxRegion_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_ContainsPoint. Expected _wxPoint_p.");
         return NULL;
         }
@@ -3348,20 +3674,22 @@ static PyObject *_wrap_wxRegion_ContainsRect(PyObject *self, PyObject *args) {
     wxRegionContain  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxRegion_ContainsRect",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRegion_ContainsRect",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_ContainsRect. Expected _wxRegion_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_ContainsRect. Expected _wxRect_p.");
         return NULL;
         }
@@ -3380,14 +3708,15 @@ static PyObject *_wrap_wxRegion_GetBox(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRect * _result;
     wxRegion * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRegion_GetBox",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegion_GetBox",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_GetBox. Expected _wxRegion_p.");
         return NULL;
         }
@@ -3408,20 +3737,22 @@ static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args) {
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxRegion_Intersect",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRegion_Intersect",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Intersect. Expected _wxRegion_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Intersect. Expected _wxRect_p.");
         return NULL;
         }
@@ -3440,13 +3771,14 @@ static PyObject *_wrap_wxRegion_IsEmpty(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRegion_IsEmpty",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegion_IsEmpty",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_IsEmpty. Expected _wxRegion_p.");
         return NULL;
         }
@@ -3466,20 +3798,22 @@ static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args) {
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxRegion_Subtract",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRegion_Subtract",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Subtract. Expected _wxRegion_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Subtract. Expected _wxRect_p.");
         return NULL;
         }
@@ -3499,20 +3833,22 @@ static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args) {
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxRegion_Union",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRegion_Union",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Union. Expected _wxRegion_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Union. Expected _wxRect_p.");
         return NULL;
         }
@@ -3532,20 +3868,22 @@ static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args) {
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxRegion_Xor",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxRegion_Xor",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Xor. Expected _wxRegion_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Xor. Expected _wxRect_p.");
         return NULL;
         }
@@ -3564,14 +3902,15 @@ static PyObject *_wrap_new_wxRegionIterator(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegionIterator * _result;
     wxRegion * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:new_wxRegionIterator",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:new_wxRegionIterator",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxRegionIterator. Expected _wxRegion_p.");
         return NULL;
         }
@@ -3581,8 +3920,13 @@ static PyObject *_wrap_new_wxRegionIterator(PyObject *self, PyObject *args) {
         _result = (wxRegionIterator *)new_wxRegionIterator(*_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRegionIterator_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxRegionIterator_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3590,13 +3934,14 @@ static PyObject *_wrap_new_wxRegionIterator(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxRegionIterator(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegionIterator * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxRegionIterator",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxRegionIterator",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRegionIterator. Expected _wxRegionIterator_p.");
         return NULL;
         }
@@ -3616,13 +3961,14 @@ static PyObject *_wrap_wxRegionIterator_GetX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetX",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetX. Expected _wxRegionIterator_p.");
         return NULL;
         }
@@ -3641,13 +3987,14 @@ static PyObject *_wrap_wxRegionIterator_GetY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetY",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetY. Expected _wxRegionIterator_p.");
         return NULL;
         }
@@ -3666,13 +4013,14 @@ static PyObject *_wrap_wxRegionIterator_GetW(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetW",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetW",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetW. Expected _wxRegionIterator_p.");
         return NULL;
         }
@@ -3691,13 +4039,14 @@ static PyObject *_wrap_wxRegionIterator_GetWidth(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetWidth",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetWidth. Expected _wxRegionIterator_p.");
         return NULL;
         }
@@ -3716,13 +4065,14 @@ static PyObject *_wrap_wxRegionIterator_GetH(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetH",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetH",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetH. Expected _wxRegionIterator_p.");
         return NULL;
         }
@@ -3741,13 +4091,14 @@ static PyObject *_wrap_wxRegionIterator_GetHeight(PyObject *self, PyObject *args
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetHeight",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetHeight. Expected _wxRegionIterator_p.");
         return NULL;
         }
@@ -3766,14 +4117,15 @@ static PyObject *_wrap_wxRegionIterator_GetRect(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     wxRect * _result;
     wxRegionIterator * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetRect",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetRect",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetRect. Expected _wxRegionIterator_p.");
         return NULL;
         }
@@ -3793,13 +4145,14 @@ static PyObject *_wrap_wxRegionIterator_HaveRects(PyObject *self, PyObject *args
     PyObject * _resultobj;
     bool  _result;
     wxRegionIterator * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_HaveRects",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_HaveRects",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_HaveRects. Expected _wxRegionIterator_p.");
         return NULL;
         }
@@ -3817,13 +4170,14 @@ static PyObject *_wrap_wxRegionIterator_HaveRects(PyObject *self, PyObject *args
 static PyObject *_wrap_wxRegionIterator_Reset(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegionIterator * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_Reset",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_Reset",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_Reset. Expected _wxRegionIterator_p.");
         return NULL;
         }
@@ -3844,13 +4198,14 @@ static void  wxRegionIterator_Next(wxRegionIterator *self) {
 static PyObject *_wrap_wxRegionIterator_Next(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRegionIterator * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_Next",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_Next",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_Next. Expected _wxRegionIterator_p.");
         return NULL;
         }
@@ -3869,9 +4224,9 @@ static PyObject *_wrap_wxRegionIterator_Next(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxAcceleratorEntry * _result;
-    int  _arg0 = 0;
-    int  _arg1 = 0;
-    int  _arg2 = 0;
+    int  _arg0 = (int ) 0;
+    int  _arg1 = (int ) 0;
+    int  _arg2 = (int ) 0;
     char _ptemp[128];
 
     self = self;
@@ -3882,8 +4237,13 @@ static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *self, PyObject *args) {
         _result = (wxAcceleratorEntry *)new_wxAcceleratorEntry(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxAcceleratorEntry_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxAcceleratorEntry_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3894,13 +4254,14 @@ static PyObject *_wrap_wxAcceleratorEntry_Set(PyObject *self, PyObject *args) {
     int  _arg1;
     int  _arg2;
     int  _arg3;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"siii:wxAcceleratorEntry_Set",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"Oiii:wxAcceleratorEntry_Set",&_argo0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxAcceleratorEntry_Set. Expected _wxAcceleratorEntry_p.");
         return NULL;
         }
@@ -3920,13 +4281,14 @@ static PyObject *_wrap_wxAcceleratorEntry_GetFlags(PyObject *self, PyObject *arg
     PyObject * _resultobj;
     int  _result;
     wxAcceleratorEntry * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxAcceleratorEntry_GetFlags",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxAcceleratorEntry_GetFlags",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxAcceleratorEntry_GetFlags. Expected _wxAcceleratorEntry_p.");
         return NULL;
         }
@@ -3945,13 +4307,14 @@ static PyObject *_wrap_wxAcceleratorEntry_GetKeyCode(PyObject *self, PyObject *a
     PyObject * _resultobj;
     int  _result;
     wxAcceleratorEntry * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxAcceleratorEntry_GetKeyCode",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxAcceleratorEntry_GetKeyCode",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxAcceleratorEntry_GetKeyCode. Expected _wxAcceleratorEntry_p.");
         return NULL;
         }
@@ -3970,13 +4333,14 @@ static PyObject *_wrap_wxAcceleratorEntry_GetCommand(PyObject *self, PyObject *a
     PyObject * _resultobj;
     int  _result;
     wxAcceleratorEntry * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxAcceleratorEntry_GetCommand",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxAcceleratorEntry_GetCommand",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxAcceleratorEntry_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxAcceleratorEntry_GetCommand. Expected _wxAcceleratorEntry_p.");
         return NULL;
         }
@@ -4022,8 +4386,13 @@ static PyObject *_wrap_new_wxAcceleratorTable(PyObject *self, PyObject *args) {
         _result = (wxAcceleratorTable *)new_wxAcceleratorTable(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxAcceleratorTable_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxAcceleratorTable_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
 {
     delete [] _arg1;
 }
@@ -4031,164 +4400,259 @@ static PyObject *_wrap_new_wxAcceleratorTable(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef misccMethods[] = {
-        { "new_wxAcceleratorTable", _wrap_new_wxAcceleratorTable, 1 },
-        { "wxAcceleratorEntry_GetCommand", _wrap_wxAcceleratorEntry_GetCommand, 1 },
-        { "wxAcceleratorEntry_GetKeyCode", _wrap_wxAcceleratorEntry_GetKeyCode, 1 },
-        { "wxAcceleratorEntry_GetFlags", _wrap_wxAcceleratorEntry_GetFlags, 1 },
-        { "wxAcceleratorEntry_Set", _wrap_wxAcceleratorEntry_Set, 1 },
-        { "new_wxAcceleratorEntry", _wrap_new_wxAcceleratorEntry, 1 },
-        { "wxRegionIterator_Next", _wrap_wxRegionIterator_Next, 1 },
-        { "wxRegionIterator_Reset", _wrap_wxRegionIterator_Reset, 1 },
-        { "wxRegionIterator_HaveRects", _wrap_wxRegionIterator_HaveRects, 1 },
-        { "wxRegionIterator_GetRect", _wrap_wxRegionIterator_GetRect, 1 },
-        { "wxRegionIterator_GetHeight", _wrap_wxRegionIterator_GetHeight, 1 },
-        { "wxRegionIterator_GetH", _wrap_wxRegionIterator_GetH, 1 },
-        { "wxRegionIterator_GetWidth", _wrap_wxRegionIterator_GetWidth, 1 },
-        { "wxRegionIterator_GetW", _wrap_wxRegionIterator_GetW, 1 },
-        { "wxRegionIterator_GetY", _wrap_wxRegionIterator_GetY, 1 },
-        { "wxRegionIterator_GetX", _wrap_wxRegionIterator_GetX, 1 },
-        { "delete_wxRegionIterator", _wrap_delete_wxRegionIterator, 1 },
-        { "new_wxRegionIterator", _wrap_new_wxRegionIterator, 1 },
-        { "wxRegion_Xor", _wrap_wxRegion_Xor, 1 },
-        { "wxRegion_Union", _wrap_wxRegion_Union, 1 },
-        { "wxRegion_Subtract", _wrap_wxRegion_Subtract, 1 },
-        { "wxRegion_IsEmpty", _wrap_wxRegion_IsEmpty, 1 },
-        { "wxRegion_Intersect", _wrap_wxRegion_Intersect, 1 },
-        { "wxRegion_GetBox", _wrap_wxRegion_GetBox, 1 },
-        { "wxRegion_ContainsRect", _wrap_wxRegion_ContainsRect, 1 },
-        { "wxRegion_ContainsPoint", _wrap_wxRegion_ContainsPoint, 1 },
-        { "wxRegion_Contains", _wrap_wxRegion_Contains, 1 },
-        { "wxRegion_Clear", _wrap_wxRegion_Clear, 1 },
-        { "delete_wxRegion", _wrap_delete_wxRegion, 1 },
-        { "new_wxRegion", _wrap_new_wxRegion, 1 },
-        { "wxLayoutConstraints_width_get", _wrap_wxLayoutConstraints_width_get, 1 },
-        { "wxLayoutConstraints_top_get", _wrap_wxLayoutConstraints_top_get, 1 },
-        { "wxLayoutConstraints_right_get", _wrap_wxLayoutConstraints_right_get, 1 },
-        { "wxLayoutConstraints_left_get", _wrap_wxLayoutConstraints_left_get, 1 },
-        { "wxLayoutConstraints_height_get", _wrap_wxLayoutConstraints_height_get, 1 },
-        { "wxLayoutConstraints_centreY_get", _wrap_wxLayoutConstraints_centreY_get, 1 },
-        { "wxLayoutConstraints_centreX_get", _wrap_wxLayoutConstraints_centreX_get, 1 },
-        { "wxLayoutConstraints_bottom_get", _wrap_wxLayoutConstraints_bottom_get, 1 },
-        { "new_wxLayoutConstraints", _wrap_new_wxLayoutConstraints, 1 },
-        { "wxIndividualLayoutConstraint_Set", _wrap_wxIndividualLayoutConstraint_Set, 1 },
-        { "wxIndividualLayoutConstraint_SameAs", _wrap_wxIndividualLayoutConstraint_SameAs, 1 },
-        { "wxIndividualLayoutConstraint_RightOf", _wrap_wxIndividualLayoutConstraint_RightOf, 1 },
-        { "wxIndividualLayoutConstraint_PercentOf", _wrap_wxIndividualLayoutConstraint_PercentOf, 1 },
-        { "wxIndividualLayoutConstraint_LeftOf", _wrap_wxIndividualLayoutConstraint_LeftOf, 1 },
-        { "wxIndividualLayoutConstraint_Unconstrained", _wrap_wxIndividualLayoutConstraint_Unconstrained, 1 },
-        { "wxIndividualLayoutConstraint_Below", _wrap_wxIndividualLayoutConstraint_Below, 1 },
-        { "wxIndividualLayoutConstraint_AsIs", _wrap_wxIndividualLayoutConstraint_AsIs, 1 },
-        { "wxIndividualLayoutConstraint_Absolute", _wrap_wxIndividualLayoutConstraint_Absolute, 1 },
-        { "wxIndividualLayoutConstraint_Above", _wrap_wxIndividualLayoutConstraint_Above, 1 },
-        { "wxPyTimer_Stop", _wrap_wxPyTimer_Stop, 1 },
-        { "wxPyTimer_Start", _wrap_wxPyTimer_Start, 1 },
-        { "wxPyTimer_Interval", _wrap_wxPyTimer_Interval, 1 },
-        { "delete_wxPyTimer", _wrap_delete_wxPyTimer, 1 },
-        { "new_wxPyTimer", _wrap_new_wxPyTimer, 1 },
-        { "wxRect_asTuple", _wrap_wxRect_asTuple, 1 },
-        { "wxRect_height_get", _wrap_wxRect_height_get, 1 },
-        { "wxRect_height_set", _wrap_wxRect_height_set, 1 },
-        { "wxRect_width_get", _wrap_wxRect_width_get, 1 },
-        { "wxRect_width_set", _wrap_wxRect_width_set, 1 },
-        { "wxRect_y_get", _wrap_wxRect_y_get, 1 },
-        { "wxRect_y_set", _wrap_wxRect_y_set, 1 },
-        { "wxRect_x_get", _wrap_wxRect_x_get, 1 },
-        { "wxRect_x_set", _wrap_wxRect_x_set, 1 },
-        { "wxRect_GetRight", _wrap_wxRect_GetRight, 1 },
-        { "wxRect_GetBottom", _wrap_wxRect_GetBottom, 1 },
-        { "wxRect_GetTop", _wrap_wxRect_GetTop, 1 },
-        { "wxRect_GetLeft", _wrap_wxRect_GetLeft, 1 },
-        { "wxRect_GetSize", _wrap_wxRect_GetSize, 1 },
-        { "wxRect_GetPosition", _wrap_wxRect_GetPosition, 1 },
-        { "wxRect_SetHeight", _wrap_wxRect_SetHeight, 1 },
-        { "wxRect_GetHeight", _wrap_wxRect_GetHeight, 1 },
-        { "wxRect_SetWidth", _wrap_wxRect_SetWidth, 1 },
-        { "wxRect_GetWidth", _wrap_wxRect_GetWidth, 1 },
-        { "wxRect_SetY", _wrap_wxRect_SetY, 1 },
-        { "wxRect_GetY", _wrap_wxRect_GetY, 1 },
-        { "wxRect_SetX", _wrap_wxRect_SetX, 1 },
-        { "wxRect_GetX", _wrap_wxRect_GetX, 1 },
-        { "delete_wxRect", _wrap_delete_wxRect, 1 },
-        { "new_wxRect", _wrap_new_wxRect, 1 },
-        { "wxPoint_asTuple", _wrap_wxPoint_asTuple, 1 },
-        { "wxPoint_Set", _wrap_wxPoint_Set, 1 },
-        { "delete_wxPoint", _wrap_delete_wxPoint, 1 },
-        { "new_wxPoint", _wrap_new_wxPoint, 1 },
-        { "wxPoint_y_get", _wrap_wxPoint_y_get, 1 },
-        { "wxPoint_y_set", _wrap_wxPoint_y_set, 1 },
-        { "wxPoint_x_get", _wrap_wxPoint_x_get, 1 },
-        { "wxPoint_x_set", _wrap_wxPoint_x_set, 1 },
-        { "delete_wxRealPoint", _wrap_delete_wxRealPoint, 1 },
-        { "new_wxRealPoint", _wrap_new_wxRealPoint, 1 },
-        { "wxRealPoint_y_get", _wrap_wxRealPoint_y_get, 1 },
-        { "wxRealPoint_y_set", _wrap_wxRealPoint_y_set, 1 },
-        { "wxRealPoint_x_get", _wrap_wxRealPoint_x_get, 1 },
-        { "wxRealPoint_x_set", _wrap_wxRealPoint_x_set, 1 },
-        { "wxSize_asTuple", _wrap_wxSize_asTuple, 1 },
-        { "wxSize_SetHeight", _wrap_wxSize_SetHeight, 1 },
-        { "wxSize_SetWidth", _wrap_wxSize_SetWidth, 1 },
-        { "wxSize_GetHeight", _wrap_wxSize_GetHeight, 1 },
-        { "wxSize_GetWidth", _wrap_wxSize_GetWidth, 1 },
-        { "wxSize_GetY", _wrap_wxSize_GetY, 1 },
-        { "wxSize_GetX", _wrap_wxSize_GetX, 1 },
-        { "wxSize_Set", _wrap_wxSize_Set, 1 },
-        { "delete_wxSize", _wrap_delete_wxSize, 1 },
-        { "new_wxSize", _wrap_new_wxSize, 1 },
-        { "wxSize_height_get", _wrap_wxSize_y_get, 1 },
-        { "wxSize_height_set", _wrap_wxSize_y_set, 1 },
-        { "wxSize_width_get", _wrap_wxSize_x_get, 1 },
-        { "wxSize_width_set", _wrap_wxSize_x_set, 1 },
-        { "wxSize_y_get", _wrap_wxSize_y_get, 1 },
-        { "wxSize_y_set", _wrap_wxSize_y_set, 1 },
-        { "wxSize_x_get", _wrap_wxSize_x_get, 1 },
-        { "wxSize_x_set", _wrap_wxSize_x_set, 1 },
-        { "wxResourceParseString", _wrap_wxResourceParseString, 1 },
-        { "wxResourceParseFile", _wrap_wxResourceParseFile, 1 },
-        { "wxResourceParseData", _wrap_wxResourceParseData, 1 },
-        { "wxResourceGetIdentifier", _wrap_wxResourceGetIdentifier, 1 },
-        { "wxResourceCreateMenuBar", _wrap_wxResourceCreateMenuBar, 1 },
-        { "wxResourceCreateIcon", _wrap_wxResourceCreateIcon, 1 },
-        { "wxResourceCreateBitmap", _wrap_wxResourceCreateBitmap, 1 },
-        { "wxResourceClear", _wrap_wxResourceClear, 1 },
-        { "wxResourceAddIdentifier", _wrap_wxResourceAddIdentifier, 1 },
-        { "wxGetResource", _wrap_wxGetResource, 1 },
-        { "wxEnableTopLevelWindows", _wrap_wxEnableTopLevelWindows, 1 },
-        { "wxSafeYield", _wrap_wxSafeYield, 1 },
-        { "wxYield", _wrap_wxYield, 1 },
-        { "wxSleep", _wrap_wxSleep, 1 },
-        { "wxGetOsVersion", _wrap_wxGetOsVersion, 1 },
-        { "wxStartTimer", _wrap_wxStartTimer, 1 },
-        { "wxShell", _wrap_wxShell, 1 },
-        { "wxNow", _wrap_wxNow, 1 },
-        { "wxIsBusy", _wrap_wxIsBusy, 1 },
-        { "wxGetMousePosition", _wrap_wxGetMousePosition, 1 },
-        { "wxGetFreeMemory", _wrap_wxGetFreeMemory, 1 },
-        { "wxGetElapsedTime", _wrap_wxGetElapsedTime, 1 },
-        { "wxGetActiveWindow", _wrap_wxGetActiveWindow, 1 },
-        { "wxExecute", _wrap_wxExecute, 1 },
-        { "wxEndBusyCursor", _wrap_wxEndBusyCursor, 1 },
-        { "wxDisplaySize", _wrap_wxDisplaySize, 1 },
-        { "wxBell", _wrap_wxBell, 1 },
-        { "wxBeginBusyCursor", _wrap_wxBeginBusyCursor, 1 },
-        { "RegisterId", _wrap_RegisterId, 1 },
-        { "NewId", _wrap_NewId, 1 },
-        { "wxRegisterId", _wrap_wxRegisterId, 1 },
-        { "wxNewId", _wrap_wxNewId, 1 },
-        { "wxSetCursor", _wrap_wxSetCursor, 1 },
-        { "wxDisplayDepth", _wrap_wxDisplayDepth, 1 },
-        { "wxColourDisplay", _wrap_wxColourDisplay, 1 },
-        { "wxMessageBox", _wrap_wxMessageBox, 1 },
-        { "wxGetSingleChoiceIndex", _wrap_wxGetSingleChoiceIndex, 1 },
-        { "wxGetSingleChoice", _wrap_wxGetSingleChoice, 1 },
-        { "wxGetTextFromUser", _wrap_wxGetTextFromUser, 1 },
-        { "wxFileSelector", _wrap_wxFileSelector, 1 },
+        { "new_wxAcceleratorTable", _wrap_new_wxAcceleratorTable, METH_VARARGS },
+        { "wxAcceleratorEntry_GetCommand", _wrap_wxAcceleratorEntry_GetCommand, METH_VARARGS },
+        { "wxAcceleratorEntry_GetKeyCode", _wrap_wxAcceleratorEntry_GetKeyCode, METH_VARARGS },
+        { "wxAcceleratorEntry_GetFlags", _wrap_wxAcceleratorEntry_GetFlags, METH_VARARGS },
+        { "wxAcceleratorEntry_Set", _wrap_wxAcceleratorEntry_Set, METH_VARARGS },
+        { "new_wxAcceleratorEntry", _wrap_new_wxAcceleratorEntry, METH_VARARGS },
+        { "wxRegionIterator_Next", _wrap_wxRegionIterator_Next, METH_VARARGS },
+        { "wxRegionIterator_Reset", _wrap_wxRegionIterator_Reset, METH_VARARGS },
+        { "wxRegionIterator_HaveRects", _wrap_wxRegionIterator_HaveRects, METH_VARARGS },
+        { "wxRegionIterator_GetRect", _wrap_wxRegionIterator_GetRect, METH_VARARGS },
+        { "wxRegionIterator_GetHeight", _wrap_wxRegionIterator_GetHeight, METH_VARARGS },
+        { "wxRegionIterator_GetH", _wrap_wxRegionIterator_GetH, METH_VARARGS },
+        { "wxRegionIterator_GetWidth", _wrap_wxRegionIterator_GetWidth, METH_VARARGS },
+        { "wxRegionIterator_GetW", _wrap_wxRegionIterator_GetW, METH_VARARGS },
+        { "wxRegionIterator_GetY", _wrap_wxRegionIterator_GetY, METH_VARARGS },
+        { "wxRegionIterator_GetX", _wrap_wxRegionIterator_GetX, METH_VARARGS },
+        { "delete_wxRegionIterator", _wrap_delete_wxRegionIterator, METH_VARARGS },
+        { "new_wxRegionIterator", _wrap_new_wxRegionIterator, METH_VARARGS },
+        { "wxRegion_Xor", _wrap_wxRegion_Xor, METH_VARARGS },
+        { "wxRegion_Union", _wrap_wxRegion_Union, METH_VARARGS },
+        { "wxRegion_Subtract", _wrap_wxRegion_Subtract, METH_VARARGS },
+        { "wxRegion_IsEmpty", _wrap_wxRegion_IsEmpty, METH_VARARGS },
+        { "wxRegion_Intersect", _wrap_wxRegion_Intersect, METH_VARARGS },
+        { "wxRegion_GetBox", _wrap_wxRegion_GetBox, METH_VARARGS },
+        { "wxRegion_ContainsRect", _wrap_wxRegion_ContainsRect, METH_VARARGS },
+        { "wxRegion_ContainsPoint", _wrap_wxRegion_ContainsPoint, METH_VARARGS },
+        { "wxRegion_Contains", _wrap_wxRegion_Contains, METH_VARARGS },
+        { "wxRegion_Clear", _wrap_wxRegion_Clear, METH_VARARGS },
+        { "delete_wxRegion", _wrap_delete_wxRegion, METH_VARARGS },
+        { "new_wxRegion", _wrap_new_wxRegion, METH_VARARGS },
+        { "wxLayoutConstraints_width_get", _wrap_wxLayoutConstraints_width_get, METH_VARARGS },
+        { "wxLayoutConstraints_top_get", _wrap_wxLayoutConstraints_top_get, METH_VARARGS },
+        { "wxLayoutConstraints_right_get", _wrap_wxLayoutConstraints_right_get, METH_VARARGS },
+        { "wxLayoutConstraints_left_get", _wrap_wxLayoutConstraints_left_get, METH_VARARGS },
+        { "wxLayoutConstraints_height_get", _wrap_wxLayoutConstraints_height_get, METH_VARARGS },
+        { "wxLayoutConstraints_centreY_get", _wrap_wxLayoutConstraints_centreY_get, METH_VARARGS },
+        { "wxLayoutConstraints_centreX_get", _wrap_wxLayoutConstraints_centreX_get, METH_VARARGS },
+        { "wxLayoutConstraints_bottom_get", _wrap_wxLayoutConstraints_bottom_get, METH_VARARGS },
+        { "new_wxLayoutConstraints", _wrap_new_wxLayoutConstraints, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_Set", _wrap_wxIndividualLayoutConstraint_Set, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_SameAs", _wrap_wxIndividualLayoutConstraint_SameAs, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_RightOf", _wrap_wxIndividualLayoutConstraint_RightOf, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_PercentOf", _wrap_wxIndividualLayoutConstraint_PercentOf, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_LeftOf", _wrap_wxIndividualLayoutConstraint_LeftOf, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_Unconstrained", _wrap_wxIndividualLayoutConstraint_Unconstrained, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_Below", _wrap_wxIndividualLayoutConstraint_Below, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_AsIs", _wrap_wxIndividualLayoutConstraint_AsIs, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_Absolute", _wrap_wxIndividualLayoutConstraint_Absolute, METH_VARARGS },
+        { "wxIndividualLayoutConstraint_Above", _wrap_wxIndividualLayoutConstraint_Above, METH_VARARGS },
+        { "wxPyTimer_Stop", _wrap_wxPyTimer_Stop, METH_VARARGS },
+        { "wxPyTimer_Start", _wrap_wxPyTimer_Start, METH_VARARGS },
+        { "wxPyTimer_Interval", _wrap_wxPyTimer_Interval, METH_VARARGS },
+        { "delete_wxPyTimer", _wrap_delete_wxPyTimer, METH_VARARGS },
+        { "new_wxPyTimer", _wrap_new_wxPyTimer, METH_VARARGS },
+        { "wxRect_asTuple", _wrap_wxRect_asTuple, METH_VARARGS },
+        { "wxRect_height_get", _wrap_wxRect_height_get, METH_VARARGS },
+        { "wxRect_height_set", _wrap_wxRect_height_set, METH_VARARGS },
+        { "wxRect_width_get", _wrap_wxRect_width_get, METH_VARARGS },
+        { "wxRect_width_set", _wrap_wxRect_width_set, METH_VARARGS },
+        { "wxRect_y_get", _wrap_wxRect_y_get, METH_VARARGS },
+        { "wxRect_y_set", _wrap_wxRect_y_set, METH_VARARGS },
+        { "wxRect_x_get", _wrap_wxRect_x_get, METH_VARARGS },
+        { "wxRect_x_set", _wrap_wxRect_x_set, METH_VARARGS },
+        { "wxRect_GetRight", _wrap_wxRect_GetRight, METH_VARARGS },
+        { "wxRect_GetBottom", _wrap_wxRect_GetBottom, METH_VARARGS },
+        { "wxRect_GetTop", _wrap_wxRect_GetTop, METH_VARARGS },
+        { "wxRect_GetLeft", _wrap_wxRect_GetLeft, METH_VARARGS },
+        { "wxRect_GetSize", _wrap_wxRect_GetSize, METH_VARARGS },
+        { "wxRect_GetPosition", _wrap_wxRect_GetPosition, METH_VARARGS },
+        { "wxRect_SetHeight", _wrap_wxRect_SetHeight, METH_VARARGS },
+        { "wxRect_GetHeight", _wrap_wxRect_GetHeight, METH_VARARGS },
+        { "wxRect_SetWidth", _wrap_wxRect_SetWidth, METH_VARARGS },
+        { "wxRect_GetWidth", _wrap_wxRect_GetWidth, METH_VARARGS },
+        { "wxRect_SetY", _wrap_wxRect_SetY, METH_VARARGS },
+        { "wxRect_GetY", _wrap_wxRect_GetY, METH_VARARGS },
+        { "wxRect_SetX", _wrap_wxRect_SetX, METH_VARARGS },
+        { "wxRect_GetX", _wrap_wxRect_GetX, METH_VARARGS },
+        { "delete_wxRect", _wrap_delete_wxRect, METH_VARARGS },
+        { "new_wxRect", _wrap_new_wxRect, METH_VARARGS },
+        { "wxPoint_asTuple", _wrap_wxPoint_asTuple, METH_VARARGS },
+        { "wxPoint_Set", _wrap_wxPoint_Set, METH_VARARGS },
+        { "delete_wxPoint", _wrap_delete_wxPoint, METH_VARARGS },
+        { "new_wxPoint", _wrap_new_wxPoint, METH_VARARGS },
+        { "wxPoint_y_get", _wrap_wxPoint_y_get, METH_VARARGS },
+        { "wxPoint_y_set", _wrap_wxPoint_y_set, METH_VARARGS },
+        { "wxPoint_x_get", _wrap_wxPoint_x_get, METH_VARARGS },
+        { "wxPoint_x_set", _wrap_wxPoint_x_set, METH_VARARGS },
+        { "delete_wxRealPoint", _wrap_delete_wxRealPoint, METH_VARARGS },
+        { "new_wxRealPoint", _wrap_new_wxRealPoint, METH_VARARGS },
+        { "wxRealPoint_y_get", _wrap_wxRealPoint_y_get, METH_VARARGS },
+        { "wxRealPoint_y_set", _wrap_wxRealPoint_y_set, METH_VARARGS },
+        { "wxRealPoint_x_get", _wrap_wxRealPoint_x_get, METH_VARARGS },
+        { "wxRealPoint_x_set", _wrap_wxRealPoint_x_set, METH_VARARGS },
+        { "wxSize_asTuple", _wrap_wxSize_asTuple, METH_VARARGS },
+        { "wxSize_SetHeight", _wrap_wxSize_SetHeight, METH_VARARGS },
+        { "wxSize_SetWidth", _wrap_wxSize_SetWidth, METH_VARARGS },
+        { "wxSize_GetHeight", _wrap_wxSize_GetHeight, METH_VARARGS },
+        { "wxSize_GetWidth", _wrap_wxSize_GetWidth, METH_VARARGS },
+        { "wxSize_GetY", _wrap_wxSize_GetY, METH_VARARGS },
+        { "wxSize_GetX", _wrap_wxSize_GetX, METH_VARARGS },
+        { "wxSize_Set", _wrap_wxSize_Set, METH_VARARGS },
+        { "delete_wxSize", _wrap_delete_wxSize, METH_VARARGS },
+        { "new_wxSize", _wrap_new_wxSize, METH_VARARGS },
+        { "wxSize_height_get", _wrap_wxSize_y_get, METH_VARARGS },
+        { "wxSize_height_set", _wrap_wxSize_y_set, METH_VARARGS },
+        { "wxSize_width_get", _wrap_wxSize_x_get, METH_VARARGS },
+        { "wxSize_width_set", _wrap_wxSize_x_set, METH_VARARGS },
+        { "wxSize_y_get", _wrap_wxSize_y_get, METH_VARARGS },
+        { "wxSize_y_set", _wrap_wxSize_y_set, METH_VARARGS },
+        { "wxSize_x_get", _wrap_wxSize_x_get, METH_VARARGS },
+        { "wxSize_x_set", _wrap_wxSize_x_set, METH_VARARGS },
+        { "wxSystemSettings_GetSystemMetric", _wrap_wxSystemSettings_GetSystemMetric, METH_VARARGS },
+        { "wxSystemSettings_GetSystemFont", _wrap_wxSystemSettings_GetSystemFont, METH_VARARGS },
+        { "wxSystemSettings_GetSystemColour", _wrap_wxSystemSettings_GetSystemColour, METH_VARARGS },
+        { "wxResourceParseString", _wrap_wxResourceParseString, METH_VARARGS },
+        { "wxResourceParseFile", _wrap_wxResourceParseFile, METH_VARARGS },
+        { "wxResourceParseData", _wrap_wxResourceParseData, METH_VARARGS },
+        { "wxResourceGetIdentifier", _wrap_wxResourceGetIdentifier, METH_VARARGS },
+        { "wxResourceCreateMenuBar", _wrap_wxResourceCreateMenuBar, METH_VARARGS },
+        { "wxResourceCreateIcon", _wrap_wxResourceCreateIcon, METH_VARARGS },
+        { "wxResourceCreateBitmap", _wrap_wxResourceCreateBitmap, METH_VARARGS },
+        { "wxResourceClear", _wrap_wxResourceClear, METH_VARARGS },
+        { "wxResourceAddIdentifier", _wrap_wxResourceAddIdentifier, METH_VARARGS },
+        { "wxGetResource", _wrap_wxGetResource, METH_VARARGS },
+        { "wxEnableTopLevelWindows", _wrap_wxEnableTopLevelWindows, METH_VARARGS },
+        { "wxSafeYield", _wrap_wxSafeYield, METH_VARARGS },
+        { "wxYield", _wrap_wxYield, METH_VARARGS },
+        { "wxSleep", _wrap_wxSleep, METH_VARARGS },
+        { "wxGetOsVersion", _wrap_wxGetOsVersion, METH_VARARGS },
+        { "wxStartTimer", _wrap_wxStartTimer, METH_VARARGS },
+        { "wxShell", _wrap_wxShell, METH_VARARGS },
+        { "wxNow", _wrap_wxNow, METH_VARARGS },
+        { "wxIsBusy", _wrap_wxIsBusy, METH_VARARGS },
+        { "wxGetMousePosition", _wrap_wxGetMousePosition, METH_VARARGS },
+        { "wxGetFreeMemory", _wrap_wxGetFreeMemory, METH_VARARGS },
+        { "wxGetElapsedTime", _wrap_wxGetElapsedTime, METH_VARARGS },
+        { "wxGetActiveWindow", _wrap_wxGetActiveWindow, METH_VARARGS },
+        { "wxExecute", _wrap_wxExecute, METH_VARARGS },
+        { "wxEndBusyCursor", _wrap_wxEndBusyCursor, METH_VARARGS },
+        { "wxDisplaySize", _wrap_wxDisplaySize, METH_VARARGS },
+        { "wxBell", _wrap_wxBell, METH_VARARGS },
+        { "wxBeginBusyCursor", _wrap_wxBeginBusyCursor, METH_VARARGS },
+        { "RegisterId", _wrap_RegisterId, METH_VARARGS },
+        { "NewId", _wrap_NewId, METH_VARARGS },
+        { "wxRegisterId", _wrap_wxRegisterId, METH_VARARGS },
+        { "wxNewId", _wrap_wxNewId, METH_VARARGS },
+        { "wxSetCursor", _wrap_wxSetCursor, METH_VARARGS },
+        { "wxDisplayDepth", _wrap_wxDisplayDepth, METH_VARARGS },
+        { "wxColourDisplay", _wrap_wxColourDisplay, METH_VARARGS },
+        { "wxGetNumberFromUser", _wrap_wxGetNumberFromUser, METH_VARARGS },
+        { "wxMessageBox", _wrap_wxMessageBox, METH_VARARGS },
+        { "wxGetSingleChoiceIndex", _wrap_wxGetSingleChoiceIndex, METH_VARARGS },
+        { "wxGetSingleChoice", _wrap_wxGetSingleChoice, METH_VARARGS },
+        { "wxGetTextFromUser", _wrap_wxGetTextFromUser, METH_VARARGS },
+        { "wxFileSelector", _wrap_wxFileSelector, METH_VARARGS },
         { NULL, NULL }
 };
+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_signed_long","_long",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_byte","_unsigned_char",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",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},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_unsigned_char","_byte",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxSize","_wxSize",0},
+{0,0,0}};
+
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
-SWIGEXPORT(void,initmiscc)() {
+SWIGEXPORT(void) initmiscc() {
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("miscc", misccMethods);
@@ -4215,90 +4679,95 @@ SWIGEXPORT(void,initmiscc)() {
         PyDict_SetItemString(d,"wxOutRegion", PyInt_FromLong((long) wxOutRegion));
         PyDict_SetItemString(d,"wxPartRegion", PyInt_FromLong((long) wxPartRegion));
         PyDict_SetItemString(d,"wxInRegion", PyInt_FromLong((long) wxInRegion));
-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_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("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",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("_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("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",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("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",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("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",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("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",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("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
+        PyDict_SetItemString(d,"wxSYS_WHITE_BRUSH", PyInt_FromLong((long) wxSYS_WHITE_BRUSH));
+        PyDict_SetItemString(d,"wxSYS_LTGRAY_BRUSH", PyInt_FromLong((long) wxSYS_LTGRAY_BRUSH));
+        PyDict_SetItemString(d,"wxSYS_GRAY_BRUSH", PyInt_FromLong((long) wxSYS_GRAY_BRUSH));
+        PyDict_SetItemString(d,"wxSYS_DKGRAY_BRUSH", PyInt_FromLong((long) wxSYS_DKGRAY_BRUSH));
+        PyDict_SetItemString(d,"wxSYS_BLACK_BRUSH", PyInt_FromLong((long) wxSYS_BLACK_BRUSH));
+        PyDict_SetItemString(d,"wxSYS_NULL_BRUSH", PyInt_FromLong((long) wxSYS_NULL_BRUSH));
+        PyDict_SetItemString(d,"wxSYS_HOLLOW_BRUSH", PyInt_FromLong((long) wxSYS_HOLLOW_BRUSH));
+        PyDict_SetItemString(d,"wxSYS_WHITE_PEN", PyInt_FromLong((long) wxSYS_WHITE_PEN));
+        PyDict_SetItemString(d,"wxSYS_BLACK_PEN", PyInt_FromLong((long) wxSYS_BLACK_PEN));
+        PyDict_SetItemString(d,"wxSYS_NULL_PEN", PyInt_FromLong((long) wxSYS_NULL_PEN));
+        PyDict_SetItemString(d,"wxSYS_OEM_FIXED_FONT", PyInt_FromLong((long) wxSYS_OEM_FIXED_FONT));
+        PyDict_SetItemString(d,"wxSYS_ANSI_FIXED_FONT", PyInt_FromLong((long) wxSYS_ANSI_FIXED_FONT));
+        PyDict_SetItemString(d,"wxSYS_ANSI_VAR_FONT", PyInt_FromLong((long) wxSYS_ANSI_VAR_FONT));
+        PyDict_SetItemString(d,"wxSYS_SYSTEM_FONT", PyInt_FromLong((long) wxSYS_SYSTEM_FONT));
+        PyDict_SetItemString(d,"wxSYS_DEVICE_DEFAULT_FONT", PyInt_FromLong((long) wxSYS_DEVICE_DEFAULT_FONT));
+        PyDict_SetItemString(d,"wxSYS_DEFAULT_PALETTE", PyInt_FromLong((long) wxSYS_DEFAULT_PALETTE));
+        PyDict_SetItemString(d,"wxSYS_SYSTEM_FIXED_FONT", PyInt_FromLong((long) wxSYS_SYSTEM_FIXED_FONT));
+        PyDict_SetItemString(d,"wxSYS_DEFAULT_GUI_FONT", PyInt_FromLong((long) wxSYS_DEFAULT_GUI_FONT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_SCROLLBAR", PyInt_FromLong((long) wxSYS_COLOUR_SCROLLBAR));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_BACKGROUND", PyInt_FromLong((long) wxSYS_COLOUR_BACKGROUND));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_ACTIVECAPTION", PyInt_FromLong((long) wxSYS_COLOUR_ACTIVECAPTION));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_INACTIVECAPTION", PyInt_FromLong((long) wxSYS_COLOUR_INACTIVECAPTION));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_MENU", PyInt_FromLong((long) wxSYS_COLOUR_MENU));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_WINDOW", PyInt_FromLong((long) wxSYS_COLOUR_WINDOW));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_WINDOWFRAME", PyInt_FromLong((long) wxSYS_COLOUR_WINDOWFRAME));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_MENUTEXT", PyInt_FromLong((long) wxSYS_COLOUR_MENUTEXT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_WINDOWTEXT", PyInt_FromLong((long) wxSYS_COLOUR_WINDOWTEXT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_CAPTIONTEXT", PyInt_FromLong((long) wxSYS_COLOUR_CAPTIONTEXT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_ACTIVEBORDER", PyInt_FromLong((long) wxSYS_COLOUR_ACTIVEBORDER));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_INACTIVEBORDER", PyInt_FromLong((long) wxSYS_COLOUR_INACTIVEBORDER));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_APPWORKSPACE", PyInt_FromLong((long) wxSYS_COLOUR_APPWORKSPACE));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_HIGHLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_HIGHLIGHT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_HIGHLIGHTTEXT", PyInt_FromLong((long) wxSYS_COLOUR_HIGHLIGHTTEXT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_BTNFACE", PyInt_FromLong((long) wxSYS_COLOUR_BTNFACE));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_BTNSHADOW", PyInt_FromLong((long) wxSYS_COLOUR_BTNSHADOW));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_GRAYTEXT", PyInt_FromLong((long) wxSYS_COLOUR_GRAYTEXT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_BTNTEXT", PyInt_FromLong((long) wxSYS_COLOUR_BTNTEXT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_INACTIVECAPTIONTEXT", PyInt_FromLong((long) wxSYS_COLOUR_INACTIVECAPTIONTEXT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_BTNHIGHLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_BTNHIGHLIGHT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_3DDKSHADOW", PyInt_FromLong((long) wxSYS_COLOUR_3DDKSHADOW));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_3DLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_3DLIGHT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_INFOTEXT", PyInt_FromLong((long) wxSYS_COLOUR_INFOTEXT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_INFOBK", PyInt_FromLong((long) wxSYS_COLOUR_INFOBK));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_DESKTOP", PyInt_FromLong((long) wxSYS_COLOUR_DESKTOP));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_3DFACE", PyInt_FromLong((long) wxSYS_COLOUR_3DFACE));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_3DSHADOW", PyInt_FromLong((long) wxSYS_COLOUR_3DSHADOW));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_3DHIGHLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_3DHIGHLIGHT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_3DHILIGHT", PyInt_FromLong((long) wxSYS_COLOUR_3DHILIGHT));
+        PyDict_SetItemString(d,"wxSYS_COLOUR_BTNHILIGHT", PyInt_FromLong((long) wxSYS_COLOUR_BTNHILIGHT));
+        PyDict_SetItemString(d,"wxSYS_MOUSE_BUTTONS", PyInt_FromLong((long) wxSYS_MOUSE_BUTTONS));
+        PyDict_SetItemString(d,"wxSYS_BORDER_X", PyInt_FromLong((long) wxSYS_BORDER_X));
+        PyDict_SetItemString(d,"wxSYS_BORDER_Y", PyInt_FromLong((long) wxSYS_BORDER_Y));
+        PyDict_SetItemString(d,"wxSYS_CURSOR_X", PyInt_FromLong((long) wxSYS_CURSOR_X));
+        PyDict_SetItemString(d,"wxSYS_CURSOR_Y", PyInt_FromLong((long) wxSYS_CURSOR_Y));
+        PyDict_SetItemString(d,"wxSYS_DCLICK_X", PyInt_FromLong((long) wxSYS_DCLICK_X));
+        PyDict_SetItemString(d,"wxSYS_DCLICK_Y", PyInt_FromLong((long) wxSYS_DCLICK_Y));
+        PyDict_SetItemString(d,"wxSYS_DRAG_X", PyInt_FromLong((long) wxSYS_DRAG_X));
+        PyDict_SetItemString(d,"wxSYS_DRAG_Y", PyInt_FromLong((long) wxSYS_DRAG_Y));
+        PyDict_SetItemString(d,"wxSYS_EDGE_X", PyInt_FromLong((long) wxSYS_EDGE_X));
+        PyDict_SetItemString(d,"wxSYS_EDGE_Y", PyInt_FromLong((long) wxSYS_EDGE_Y));
+        PyDict_SetItemString(d,"wxSYS_HSCROLL_ARROW_X", PyInt_FromLong((long) wxSYS_HSCROLL_ARROW_X));
+        PyDict_SetItemString(d,"wxSYS_HSCROLL_ARROW_Y", PyInt_FromLong((long) wxSYS_HSCROLL_ARROW_Y));
+        PyDict_SetItemString(d,"wxSYS_HTHUMB_X", PyInt_FromLong((long) wxSYS_HTHUMB_X));
+        PyDict_SetItemString(d,"wxSYS_ICON_X", PyInt_FromLong((long) wxSYS_ICON_X));
+        PyDict_SetItemString(d,"wxSYS_ICON_Y", PyInt_FromLong((long) wxSYS_ICON_Y));
+        PyDict_SetItemString(d,"wxSYS_ICONSPACING_X", PyInt_FromLong((long) wxSYS_ICONSPACING_X));
+        PyDict_SetItemString(d,"wxSYS_ICONSPACING_Y", PyInt_FromLong((long) wxSYS_ICONSPACING_Y));
+        PyDict_SetItemString(d,"wxSYS_WINDOWMIN_X", PyInt_FromLong((long) wxSYS_WINDOWMIN_X));
+        PyDict_SetItemString(d,"wxSYS_WINDOWMIN_Y", PyInt_FromLong((long) wxSYS_WINDOWMIN_Y));
+        PyDict_SetItemString(d,"wxSYS_SCREEN_X", PyInt_FromLong((long) wxSYS_SCREEN_X));
+        PyDict_SetItemString(d,"wxSYS_SCREEN_Y", PyInt_FromLong((long) wxSYS_SCREEN_Y));
+        PyDict_SetItemString(d,"wxSYS_FRAMESIZE_X", PyInt_FromLong((long) wxSYS_FRAMESIZE_X));
+        PyDict_SetItemString(d,"wxSYS_FRAMESIZE_Y", PyInt_FromLong((long) wxSYS_FRAMESIZE_Y));
+        PyDict_SetItemString(d,"wxSYS_SMALLICON_X", PyInt_FromLong((long) wxSYS_SMALLICON_X));
+        PyDict_SetItemString(d,"wxSYS_SMALLICON_Y", PyInt_FromLong((long) wxSYS_SMALLICON_Y));
+        PyDict_SetItemString(d,"wxSYS_HSCROLL_Y", PyInt_FromLong((long) wxSYS_HSCROLL_Y));
+        PyDict_SetItemString(d,"wxSYS_VSCROLL_X", PyInt_FromLong((long) wxSYS_VSCROLL_X));
+        PyDict_SetItemString(d,"wxSYS_VSCROLL_ARROW_X", PyInt_FromLong((long) wxSYS_VSCROLL_ARROW_X));
+        PyDict_SetItemString(d,"wxSYS_VSCROLL_ARROW_Y", PyInt_FromLong((long) wxSYS_VSCROLL_ARROW_Y));
+        PyDict_SetItemString(d,"wxSYS_VTHUMB_Y", PyInt_FromLong((long) wxSYS_VTHUMB_Y));
+        PyDict_SetItemString(d,"wxSYS_CAPTION_Y", PyInt_FromLong((long) wxSYS_CAPTION_Y));
+        PyDict_SetItemString(d,"wxSYS_MENU_Y", PyInt_FromLong((long) wxSYS_MENU_Y));
+        PyDict_SetItemString(d,"wxSYS_NETWORK_PRESENT", PyInt_FromLong((long) wxSYS_NETWORK_PRESENT));
+        PyDict_SetItemString(d,"wxSYS_PENWINDOWS_PRESENT", PyInt_FromLong((long) wxSYS_PENWINDOWS_PRESENT));
+        PyDict_SetItemString(d,"wxSYS_SHOW_SOUNDS", PyInt_FromLong((long) wxSYS_SHOW_SOUNDS));
+        PyDict_SetItemString(d,"wxSYS_SWAP_BUTTONS", PyInt_FromLong((long) wxSYS_SWAP_BUTTONS));
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}
 }