Fixed "Bound pointer address" error under GCC-2.95

[wxWidgets.git] / utils / wxPython / src / gtk / gdi.cpp

diff --git a/utils/wxPython/src/gtk/gdi.cpp b/utils/wxPython/src/gtk/gdi.cpp
index 3bb0531df3b51c14144fa235cd69fb8e251766b0..4dade855b2b00e5492dea6aeac82b01d984f8ea8 100644 (file)
--- a/utils/wxPython/src/gtk/gdi.cpp
+++ b/utils/wxPython/src/gtk/gdi.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    initgdic
 
 #define SWIG_name    "gdic"
@@ -132,6 +132,13 @@ static char* wxStringErrorMsg = "string type is required for parameter";
         return new wxBitmap(name, flags);
     }
 
+#ifdef __WXMSW__
+    wxBitmap* wxBitmapFromData(char* data, long type,
+                               int width, int height, int depth = 1) {
+        return new wxBitmap((void*)data, type, width, height, depth);
+    }
+#endif
+
     wxMask* wxMaskColour(const wxBitmap& bitmap, const wxColour& colour) {
         return new wxMask(bitmap, colour);
     }
@@ -192,13 +199,16 @@ extern wxPalette  wxNullPalette;
 extern wxFont  wxNullFont; 
 extern wxColour  wxNullColour; 
 
+#endif
+#ifdef __cplusplus
+extern "C" {
 #endif
 static PyObject *_wrap_wxEmptyBitmap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _result;
     int  _arg0;
     int  _arg1;
-    int  _arg2 = -1;
+    int  _arg2 = (int ) -1;
     char _ptemp[128];
 
     self = self;
@@ -209,8 +219,13 @@ static PyObject *_wrap_wxEmptyBitmap(PyObject *self, PyObject *args) {
         _result = (wxBitmap *)wxEmptyBitmap(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -229,8 +244,13 @@ static PyObject *_wrap_wxNoRefBitmap(PyObject *self, PyObject *args) {
         _result = (wxBitmap *)wxNoRefBitmap(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -239,21 +259,23 @@ static PyObject *_wrap_wxMaskColour(PyObject *self, PyObject *args) {
     wxMask * _result;
     wxBitmap * _arg0;
     wxColour * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxMaskColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMaskColour",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMaskColour. Expected _wxBitmap_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMaskColour. Expected _wxColour_p.");
         return NULL;
         }
@@ -263,8 +285,13 @@ static PyObject *_wrap_wxMaskColour(PyObject *self, PyObject *args) {
         _result = (wxMask *)wxMaskColour(*_arg0,*_arg1);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -282,8 +309,13 @@ static PyObject *_wrap_wxStockCursor(PyObject *self, PyObject *args) {
         _result = (wxCursor *)wxPyStockCursor(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxCursor_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxCursor_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -309,8 +341,13 @@ static PyObject *_wrap_wxNamedColour(PyObject *self, PyObject *args) {
         _result = (wxColour *)wxNamedColour(*_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
 {
     if (_obj0)
         delete _arg0;
@@ -322,14 +359,15 @@ static PyObject *_wrap_wxMemoryDCFromDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMemoryDC * _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxMemoryDCFromDC",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxMemoryDCFromDC",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMemoryDCFromDC. Expected _wxDC_p.");
         return NULL;
         }
@@ -339,8 +377,13 @@ static PyObject *_wrap_wxMemoryDCFromDC(PyObject *self, PyObject *args) {
         _result = (wxMemoryDC *)wxMemoryDCFromDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMemoryDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMemoryDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -998,8 +1041,13 @@ static PyObject *_wrap_new_wxBitmap(PyObject *self, PyObject *args) {
         _result = (wxBitmap *)new_wxBitmap(*_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
 {
     if (_obj0)
         delete _arg0;
@@ -1011,13 +1059,14 @@ static PyObject *_wrap_new_wxBitmap(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxBitmap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxBitmap",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxBitmap",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxBitmap. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -1037,13 +1086,14 @@ static PyObject *_wrap_wxBitmap_GetDepth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxBitmap * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxBitmap_GetDepth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmap_GetDepth",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetDepth. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -1062,13 +1112,14 @@ static PyObject *_wrap_wxBitmap_GetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxBitmap * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxBitmap_GetHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmap_GetHeight",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetHeight. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -1087,14 +1138,15 @@ static PyObject *_wrap_wxBitmap_GetPalette(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPalette * _result;
     wxBitmap * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxBitmap_GetPalette",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmap_GetPalette",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetPalette. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -1104,8 +1156,13 @@ static PyObject *_wrap_wxBitmap_GetPalette(PyObject *self, PyObject *args) {
         _result = (wxPalette *)wxBitmap_GetPalette(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPalette_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPalette_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -1114,14 +1171,15 @@ static PyObject *_wrap_wxBitmap_GetMask(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMask * _result;
     wxBitmap * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxBitmap_GetMask",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmap_GetMask",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetMask. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -1131,8 +1189,13 @@ static PyObject *_wrap_wxBitmap_GetMask(PyObject *self, PyObject *args) {
         _result = (wxMask *)wxBitmap_GetMask(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -1141,13 +1204,14 @@ static PyObject *_wrap_wxBitmap_GetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxBitmap * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxBitmap_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmap_GetWidth",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetWidth. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -1168,14 +1232,15 @@ static PyObject *_wrap_wxBitmap_LoadFile(PyObject *self, PyObject *args) {
     wxBitmap * _arg0;
     wxString * _arg1;
     long  _arg2;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sOl:wxBitmap_LoadFile",&_argc0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OOl:wxBitmap_LoadFile",&_argo0,&_obj1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_LoadFile. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -1205,13 +1270,14 @@ static PyObject *_wrap_wxBitmap_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxBitmap * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxBitmap_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBitmap_Ok",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_Ok. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -1232,16 +1298,17 @@ static PyObject *_wrap_wxBitmap_SaveFile(PyObject *self, PyObject *args) {
     wxBitmap * _arg0;
     wxString * _arg1;
     int  _arg2;
-    wxPalette * _arg3 = NULL;
-    char * _argc0 = 0;
+    wxPalette * _arg3 = (wxPalette *) NULL;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
-    char * _argc3 = 0;
+    PyObject * _argo3 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sOi|s:wxBitmap_SaveFile",&_argc0,&_obj1,&_arg2,&_argc3)) 
+    if(!PyArg_ParseTuple(args,"OOi|O:wxBitmap_SaveFile",&_argo0,&_obj1,&_arg2,&_argo3)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SaveFile. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -1253,8 +1320,9 @@ static PyObject *_wrap_wxBitmap_SaveFile(PyObject *self, PyObject *args) {
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPalette_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPalette_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxBitmap_SaveFile. Expected _wxPalette_p.");
         return NULL;
         }
@@ -1277,13 +1345,14 @@ static PyObject *_wrap_wxBitmap_SetDepth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxBitmap_SetDepth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxBitmap_SetDepth",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetDepth. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -1303,13 +1372,14 @@ static PyObject *_wrap_wxBitmap_SetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxBitmap_SetHeight",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxBitmap_SetHeight",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetHeight. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -1329,20 +1399,22 @@ static PyObject *_wrap_wxBitmap_SetMask(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _arg0;
     wxMask * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxBitmap_SetMask",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxBitmap_SetMask",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetMask. Expected _wxBitmap_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMask_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMask_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmap_SetMask. Expected _wxMask_p.");
         return NULL;
         }
@@ -1362,13 +1434,14 @@ static PyObject *_wrap_wxBitmap_SetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxBitmap_SetWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxBitmap_SetWidth",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetWidth. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -1388,14 +1461,15 @@ static PyObject *_wrap_new_wxMask(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMask * _result;
     wxBitmap * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:new_wxMask",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:new_wxMask",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmap_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMask. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -1405,8 +1479,13 @@ static PyObject *_wrap_new_wxMask(PyObject *self, PyObject *args) {
         _result = (wxMask *)new_wxMask(*_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -1414,13 +1493,14 @@ static PyObject *_wrap_new_wxMask(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxMask(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMask * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxMask",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxMask",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMask_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMask_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxMask. Expected _wxMask_p.");
         return NULL;
         }
@@ -1443,17 +1523,58 @@ static void *SwigwxIconTowxBitmap(void *ptr) {
     return (void *) dest;
 }
 
+#define new_wxIcon(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxIcon(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
+static PyObject *_wrap_new_wxIcon(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxIcon * _result;
+    wxString * _arg0;
+    long  _arg1;
+    int  _arg2 = (int ) -1;
+    int  _arg3 = (int ) -1;
+    PyObject * _obj0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"Ol|ii:new_wxIcon",&_obj0,&_arg1,&_arg2,&_arg3)) 
+        return NULL;
+{
+    if (!PyString_Check(_obj0)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxIcon *)new_wxIcon(*_arg0,_arg1,_arg2,_arg3);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxIcon_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+{
+    if (_obj0)
+        delete _arg0;
+}
+    return _resultobj;
+}
+
 #define delete_wxIcon(_swigobj) (delete _swigobj)
 static PyObject *_wrap_delete_wxIcon(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIcon * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxIcon",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxIcon",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxIcon. Expected _wxIcon_p.");
         return NULL;
         }
@@ -1473,13 +1594,14 @@ static PyObject *_wrap_wxIcon_GetDepth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxIcon * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxIcon_GetDepth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxIcon_GetDepth",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_GetDepth. Expected _wxIcon_p.");
         return NULL;
         }
@@ -1498,13 +1620,14 @@ static PyObject *_wrap_wxIcon_GetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxIcon * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxIcon_GetHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxIcon_GetHeight",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_GetHeight. Expected _wxIcon_p.");
         return NULL;
         }
@@ -1523,13 +1646,14 @@ static PyObject *_wrap_wxIcon_GetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxIcon * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxIcon_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxIcon_GetWidth",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_GetWidth. Expected _wxIcon_p.");
         return NULL;
         }
@@ -1550,14 +1674,15 @@ static PyObject *_wrap_wxIcon_LoadFile(PyObject *self, PyObject *args) {
     wxIcon * _arg0;
     wxString * _arg1;
     long  _arg2;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sOl:wxIcon_LoadFile",&_argc0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"OOl:wxIcon_LoadFile",&_argo0,&_obj1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_LoadFile. Expected _wxIcon_p.");
         return NULL;
         }
@@ -1587,13 +1712,14 @@ static PyObject *_wrap_wxIcon_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxIcon * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxIcon_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxIcon_Ok",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_Ok. Expected _wxIcon_p.");
         return NULL;
         }
@@ -1612,13 +1738,14 @@ static PyObject *_wrap_wxIcon_SetDepth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIcon * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxIcon_SetDepth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxIcon_SetDepth",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetDepth. Expected _wxIcon_p.");
         return NULL;
         }
@@ -1638,13 +1765,14 @@ static PyObject *_wrap_wxIcon_SetHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIcon * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxIcon_SetHeight",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxIcon_SetHeight",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetHeight. Expected _wxIcon_p.");
         return NULL;
         }
@@ -1664,13 +1792,14 @@ static PyObject *_wrap_wxIcon_SetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxIcon * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxIcon_SetWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxIcon_SetWidth",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxIcon_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetWidth. Expected _wxIcon_p.");
         return NULL;
         }
@@ -1697,13 +1826,14 @@ static void *SwigwxCursorTowxBitmap(void *ptr) {
 static PyObject *_wrap_delete_wxCursor(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxCursor * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxCursor",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxCursor",&_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 delete_wxCursor. Expected _wxCursor_p.");
         return NULL;
         }
@@ -1723,13 +1853,14 @@ static PyObject *_wrap_wxCursor_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxCursor * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxCursor_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxCursor_Ok",&_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 wxCursor_Ok. Expected _wxCursor_p.");
         return NULL;
         }
@@ -1756,8 +1887,8 @@ static PyObject *_wrap_new_wxFont(PyObject *self, PyObject *args) {
     int  _arg1;
     int  _arg2;
     int  _arg3;
-    int  _arg4 = (0);
-    char * _arg5 = "";
+    int  _arg4 = (int ) FALSE;
+    char * _arg5 = (char *) "";
     char _ptemp[128];
 
     self = self;
@@ -1768,8 +1899,13 @@ static PyObject *_wrap_new_wxFont(PyObject *self, PyObject *args) {
         _result = (wxFont *)new_wxFont(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -1778,13 +1914,14 @@ static PyObject *_wrap_wxFont_GetFaceName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxFont * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFont_GetFaceName",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFont_GetFaceName",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetFaceName. Expected _wxFont_p.");
         return NULL;
         }
@@ -1808,13 +1945,14 @@ static PyObject *_wrap_wxFont_GetFamily(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFont_GetFamily",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFont_GetFamily",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetFamily. Expected _wxFont_p.");
         return NULL;
         }
@@ -1833,13 +1971,14 @@ static PyObject *_wrap_wxFont_GetPointSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFont_GetPointSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFont_GetPointSize",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetPointSize. Expected _wxFont_p.");
         return NULL;
         }
@@ -1858,13 +1997,14 @@ static PyObject *_wrap_wxFont_GetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFont_GetStyle",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFont_GetStyle",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetStyle. Expected _wxFont_p.");
         return NULL;
         }
@@ -1883,13 +2023,14 @@ static PyObject *_wrap_wxFont_GetUnderlined(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxFont * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFont_GetUnderlined",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFont_GetUnderlined",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetUnderlined. Expected _wxFont_p.");
         return NULL;
         }
@@ -1908,13 +2049,14 @@ static PyObject *_wrap_wxFont_GetWeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxFont * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFont_GetWeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxFont_GetWeight",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetWeight. Expected _wxFont_p.");
         return NULL;
         }
@@ -1933,14 +2075,15 @@ static PyObject *_wrap_wxFont_SetFaceName(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _arg0;
     wxString * _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxFont_SetFaceName",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxFont_SetFaceName",&_argo0,&_obj1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetFaceName. Expected _wxFont_p.");
         return NULL;
         }
@@ -1971,13 +2114,14 @@ static PyObject *_wrap_wxFont_SetFamily(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxFont_SetFamily",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFont_SetFamily",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetFamily. Expected _wxFont_p.");
         return NULL;
         }
@@ -1997,13 +2141,14 @@ static PyObject *_wrap_wxFont_SetPointSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxFont_SetPointSize",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFont_SetPointSize",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetPointSize. Expected _wxFont_p.");
         return NULL;
         }
@@ -2023,13 +2168,14 @@ static PyObject *_wrap_wxFont_SetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxFont_SetStyle",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFont_SetStyle",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetStyle. Expected _wxFont_p.");
         return NULL;
         }
@@ -2049,14 +2195,15 @@ static PyObject *_wrap_wxFont_SetUnderlined(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _arg0;
     bool  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     int tempbool1;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxFont_SetUnderlined",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFont_SetUnderlined",&_argo0,&tempbool1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetUnderlined. Expected _wxFont_p.");
         return NULL;
         }
@@ -2077,13 +2224,14 @@ static PyObject *_wrap_wxFont_SetWeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxFont_SetWeight",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxFont_SetWeight",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_SetWeight. Expected _wxFont_p.");
         return NULL;
         }
@@ -2102,9 +2250,9 @@ static PyObject *_wrap_wxFont_SetWeight(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_wxColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _result;
-    unsigned char  _arg0 = 0;
-    unsigned char  _arg1 = 0;
-    unsigned char  _arg2 = 0;
+    unsigned char  _arg0 = (unsigned char ) 0;
+    unsigned char  _arg1 = (unsigned char ) 0;
+    unsigned char  _arg2 = (unsigned char ) 0;
     char _ptemp[128];
 
     self = self;
@@ -2115,8 +2263,13 @@ static PyObject *_wrap_new_wxColour(PyObject *self, PyObject *args) {
         _result = (wxColour *)new_wxColour(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -2124,13 +2277,14 @@ static PyObject *_wrap_new_wxColour(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxColour",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxColour. Expected _wxColour_p.");
         return NULL;
         }
@@ -2150,13 +2304,14 @@ static PyObject *_wrap_wxColour_Red(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxColour * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxColour_Red",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColour_Red",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Red. Expected _wxColour_p.");
         return NULL;
         }
@@ -2175,13 +2330,14 @@ static PyObject *_wrap_wxColour_Green(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxColour * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxColour_Green",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColour_Green",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Green. Expected _wxColour_p.");
         return NULL;
         }
@@ -2200,13 +2356,14 @@ static PyObject *_wrap_wxColour_Blue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxColour * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxColour_Blue",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColour_Blue",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Blue. Expected _wxColour_p.");
         return NULL;
         }
@@ -2225,13 +2382,14 @@ static PyObject *_wrap_wxColour_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxColour * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxColour_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColour_Ok",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Ok. Expected _wxColour_p.");
         return NULL;
         }
@@ -2252,13 +2410,14 @@ static PyObject *_wrap_wxColour_Set(PyObject *self, PyObject *args) {
     unsigned char  _arg1;
     unsigned char  _arg2;
     unsigned char  _arg3;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sbbb:wxColour_Set",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"Obbb:wxColour_Set",&_argo0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Set. Expected _wxColour_p.");
         return NULL;
         }
@@ -2284,13 +2443,14 @@ static PyObject *_wrap_wxColour_Get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     PyObject * _result;
     wxColour * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxColour_Get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxColour_Get",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColour_Get. Expected _wxColour_p.");
         return NULL;
         }
@@ -2314,16 +2474,17 @@ static PyObject *_wrap_new_wxPen(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _result;
     wxColour * _arg0;
-    int  _arg1 = 1;
-    int  _arg2 = (wxSOLID);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) 1;
+    int  _arg2 = (int ) wxSOLID;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|ii:new_wxPen",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"O|ii:new_wxPen",&_argo0,&_arg1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPen. Expected _wxColour_p.");
         return NULL;
         }
@@ -2333,8 +2494,13 @@ static PyObject *_wrap_new_wxPen(PyObject *self, PyObject *args) {
         _result = (wxPen *)new_wxPen(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -2343,13 +2509,14 @@ static PyObject *_wrap_wxPen_GetCap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPen * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxPen_GetCap",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPen_GetCap",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetCap. Expected _wxPen_p.");
         return NULL;
         }
@@ -2368,14 +2535,15 @@ static PyObject *_wrap_wxPen_GetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _result;
     wxPen * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxPen_GetColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPen_GetColour",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetColour. Expected _wxPen_p.");
         return NULL;
         }
@@ -2386,8 +2554,13 @@ static PyObject *_wrap_wxPen_GetColour(PyObject *self, PyObject *args) {
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -2396,13 +2569,14 @@ static PyObject *_wrap_wxPen_GetJoin(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPen * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxPen_GetJoin",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPen_GetJoin",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetJoin. Expected _wxPen_p.");
         return NULL;
         }
@@ -2421,13 +2595,14 @@ static PyObject *_wrap_wxPen_GetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPen * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxPen_GetStyle",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPen_GetStyle",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetStyle. Expected _wxPen_p.");
         return NULL;
         }
@@ -2446,13 +2621,14 @@ static PyObject *_wrap_wxPen_GetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxPen * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxPen_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPen_GetWidth",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetWidth. Expected _wxPen_p.");
         return NULL;
         }
@@ -2471,13 +2647,14 @@ static PyObject *_wrap_wxPen_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxPen * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxPen_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPen_Ok",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_Ok. Expected _wxPen_p.");
         return NULL;
         }
@@ -2496,13 +2673,14 @@ static PyObject *_wrap_wxPen_SetCap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxPen_SetCap",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPen_SetCap",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetCap. Expected _wxPen_p.");
         return NULL;
         }
@@ -2522,20 +2700,22 @@ static PyObject *_wrap_wxPen_SetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _arg0;
     wxColour * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxPen_SetColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxPen_SetColour",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetColour. Expected _wxPen_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_SetColour. Expected _wxColour_p.");
         return NULL;
         }
@@ -2555,13 +2735,14 @@ static PyObject *_wrap_wxPen_SetJoin(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxPen_SetJoin",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPen_SetJoin",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetJoin. Expected _wxPen_p.");
         return NULL;
         }
@@ -2581,13 +2762,14 @@ static PyObject *_wrap_wxPen_SetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxPen_SetStyle",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPen_SetStyle",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetStyle. Expected _wxPen_p.");
         return NULL;
         }
@@ -2607,13 +2789,14 @@ static PyObject *_wrap_wxPen_SetWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxPen_SetWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxPen_SetWidth",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetWidth. Expected _wxPen_p.");
         return NULL;
         }
@@ -2636,15 +2819,16 @@ static PyObject *_wrap_new_wxBrush(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBrush * _result;
     wxColour * _arg0;
-    int  _arg1 = (wxSOLID);
-    char * _argc0 = 0;
+    int  _arg1 = (int ) wxSOLID;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|i:new_wxBrush",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"O|i:new_wxBrush",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxColour_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxBrush. Expected _wxColour_p.");
         return NULL;
         }
@@ -2654,8 +2838,13 @@ static PyObject *_wrap_new_wxBrush(PyObject *self, PyObject *args) {
         _result = (wxBrush *)new_wxBrush(_arg0,_arg1);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -2664,14 +2853,15 @@ static PyObject *_wrap_wxBrush_GetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _result;
     wxBrush * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxBrush_GetColour",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBrush_GetColour",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_GetColour. Expected _wxBrush_p.");
         return NULL;
         }
@@ -2682,8 +2872,13 @@ static PyObject *_wrap_wxBrush_GetColour(PyObject *self, PyObject *args) {
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -2692,14 +2887,15 @@ static PyObject *_wrap_wxBrush_GetStipple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBrush * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxBrush_GetStipple",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBrush_GetStipple",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_GetStipple. Expected _wxBrush_p.");
         return NULL;
         }
@@ -2709,8 +2905,13 @@ static PyObject *_wrap_wxBrush_GetStipple(PyObject *self, PyObject *args) {
         _result = (wxBitmap *)wxBrush_GetStipple(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -2719,13 +2920,14 @@ static PyObject *_wrap_wxBrush_GetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxBrush * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxBrush_GetStyle",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBrush_GetStyle",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_GetStyle. Expected _wxBrush_p.");
         return NULL;
         }
@@ -2744,13 +2946,14 @@ static PyObject *_wrap_wxBrush_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxBrush * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxBrush_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxBrush_Ok",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_Ok. Expected _wxBrush_p.");
         return NULL;
         }
@@ -2769,20 +2972,22 @@ static PyObject *_wrap_wxBrush_SetColour(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBrush * _arg0;
     wxColour * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxBrush_SetColour",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxBrush_SetColour",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_SetColour. Expected _wxBrush_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBrush_SetColour. Expected _wxColour_p.");
         return NULL;
         }
@@ -2802,20 +3007,22 @@ static PyObject *_wrap_wxBrush_SetStipple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBrush * _arg0;
     wxBitmap * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxBrush_SetStipple",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxBrush_SetStipple",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_SetStipple. Expected _wxBrush_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBrush_SetStipple. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -2835,13 +3042,14 @@ static PyObject *_wrap_wxBrush_SetStyle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBrush * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxBrush_SetStyle",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxBrush_SetStyle",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_SetStyle. Expected _wxBrush_p.");
         return NULL;
         }
@@ -2860,13 +3068,14 @@ static PyObject *_wrap_wxBrush_SetStyle(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxDC",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxDC",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxDC. Expected _wxDC_p.");
         return NULL;
         }
@@ -2885,13 +3094,14 @@ static PyObject *_wrap_delete_wxDC(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_BeginDrawing(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_BeginDrawing",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_BeginDrawing",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_BeginDrawing. Expected _wxDC_p.");
         return NULL;
         }
@@ -2919,20 +3129,22 @@ static PyObject *_wrap_wxDC_Blit(PyObject *self, PyObject *args) {
     long  _arg6;
     long  _arg7;
     long  _arg8;
-    char * _argc0 = 0;
-    char * _argc5 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo5 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sllllslll:wxDC_Blit",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_argc5,&_arg6,&_arg7,&_arg8)) 
+    if(!PyArg_ParseTuple(args,"OllllOlll:wxDC_Blit",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5,&_arg6,&_arg7,&_arg8)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_Blit. Expected _wxDC_p.");
         return NULL;
         }
     }
-    if (_argc5) {
-        if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxDC_p")) {
+    if (_argo5) {
+        if (_argo5 == Py_None) { _arg5 = NULL; }
+        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of wxDC_Blit. Expected _wxDC_p.");
         return NULL;
         }
@@ -2950,13 +3162,14 @@ static PyObject *_wrap_wxDC_Blit(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_Clear(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_Clear",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_Clear",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_Clear. Expected _wxDC_p.");
         return NULL;
         }
@@ -2977,13 +3190,14 @@ static PyObject *_wrap_wxDC_CrossHair(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     long  _arg1;
     long  _arg2;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sll:wxDC_CrossHair",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxDC_CrossHair",&_argo0,&_arg1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_CrossHair. Expected _wxDC_p.");
         return NULL;
         }
@@ -3002,13 +3216,14 @@ static PyObject *_wrap_wxDC_CrossHair(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_DestroyClippingRegion(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_DestroyClippingRegion",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_DestroyClippingRegion",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DestroyClippingRegion. Expected _wxDC_p.");
         return NULL;
         }
@@ -3029,13 +3244,14 @@ static PyObject *_wrap_wxDC_DeviceToLogicalX(PyObject *self, PyObject *args) {
     long  _result;
     wxDC * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxDC_DeviceToLogicalX",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_DeviceToLogicalX",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DeviceToLogicalX. Expected _wxDC_p.");
         return NULL;
         }
@@ -3055,13 +3271,14 @@ static PyObject *_wrap_wxDC_DeviceToLogicalXRel(PyObject *self, PyObject *args)
     long  _result;
     wxDC * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxDC_DeviceToLogicalXRel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_DeviceToLogicalXRel",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DeviceToLogicalXRel. Expected _wxDC_p.");
         return NULL;
         }
@@ -3081,13 +3298,14 @@ static PyObject *_wrap_wxDC_DeviceToLogicalY(PyObject *self, PyObject *args) {
     long  _result;
     wxDC * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxDC_DeviceToLogicalY",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_DeviceToLogicalY",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DeviceToLogicalY. Expected _wxDC_p.");
         return NULL;
         }
@@ -3107,13 +3325,14 @@ static PyObject *_wrap_wxDC_DeviceToLogicalYRel(PyObject *self, PyObject *args)
     long  _result;
     wxDC * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxDC_DeviceToLogicalYRel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_DeviceToLogicalYRel",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DeviceToLogicalYRel. Expected _wxDC_p.");
         return NULL;
         }
@@ -3137,13 +3356,14 @@ static PyObject *_wrap_wxDC_DrawArc(PyObject *self, PyObject *args) {
     long  _arg4;
     long  _arg5;
     long  _arg6;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sllllll:wxDC_DrawArc",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"Ollllll:wxDC_DrawArc",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawArc. Expected _wxDC_p.");
         return NULL;
         }
@@ -3158,6 +3378,35 @@ static PyObject *_wrap_wxDC_DrawArc(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxDC_DrawCircle(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->DrawCircle(_swigarg0,_swigarg1,_swigarg2))
+static PyObject *_wrap_wxDC_DrawCircle(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxDC * _arg0;
+    long  _arg1;
+    long  _arg2;
+    long  _arg3;
+    PyObject * _argo0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"Olll:wxDC_DrawCircle",&_argo0,&_arg1,&_arg2,&_arg3)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawCircle. Expected _wxDC_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxDC_DrawCircle(_arg0,_arg1,_arg2,_arg3);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxDC_DrawEllipse(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->DrawEllipse(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
 static PyObject *_wrap_wxDC_DrawEllipse(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -3166,13 +3415,14 @@ static PyObject *_wrap_wxDC_DrawEllipse(PyObject *self, PyObject *args) {
     long  _arg2;
     long  _arg3;
     long  _arg4;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sllll:wxDC_DrawEllipse",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"Ollll:wxDC_DrawEllipse",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawEllipse. Expected _wxDC_p.");
         return NULL;
         }
@@ -3197,13 +3447,14 @@ static PyObject *_wrap_wxDC_DrawEllipticArc(PyObject *self, PyObject *args) {
     long  _arg4;
     long  _arg5;
     long  _arg6;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sllllll:wxDC_DrawEllipticArc",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTuple(args,"Ollllll:wxDC_DrawEllipticArc",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawEllipticArc. Expected _wxDC_p.");
         return NULL;
         }
@@ -3225,20 +3476,22 @@ static PyObject *_wrap_wxDC_DrawIcon(PyObject *self, PyObject *args) {
     wxIcon * _arg1;
     long  _arg2;
     long  _arg3;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ssll:wxDC_DrawIcon",&_argc0,&_argc1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOll:wxDC_DrawIcon",&_argo0,&_argo1,&_arg2,&_arg3)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawIcon. Expected _wxDC_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxIcon_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxIcon_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_DrawIcon. Expected _wxIcon_p.");
         return NULL;
         }
@@ -3261,13 +3514,14 @@ static PyObject *_wrap_wxDC_DrawLine(PyObject *self, PyObject *args) {
     long  _arg2;
     long  _arg3;
     long  _arg4;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sllll:wxDC_DrawLine",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"Ollll:wxDC_DrawLine",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawLine. Expected _wxDC_p.");
         return NULL;
         }
@@ -3288,16 +3542,17 @@ static PyObject *_wrap_wxDC_DrawLines(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     int  _arg1;
     wxPoint * _arg2;
-    long  _arg3 = 0;
-    long  _arg4 = 0;
-    char * _argc0 = 0;
+    long  _arg3 = (long ) 0;
+    long  _arg4 = (long ) 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO|ll:wxDC_DrawLines",&_argc0,&_obj2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"OO|ll:wxDC_DrawLines",&_argo0,&_obj2,&_arg3,&_arg4)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawLines. Expected _wxDC_p.");
         return NULL;
         }
@@ -3336,17 +3591,18 @@ static PyObject *_wrap_wxDC_DrawPolygon(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     int  _arg1;
     wxPoint * _arg2;
-    long  _arg3 = 0;
-    long  _arg4 = 0;
-    int  _arg5 = (wxODDEVEN_RULE);
-    char * _argc0 = 0;
+    long  _arg3 = (long ) 0;
+    long  _arg4 = (long ) 0;
+    int  _arg5 = (int ) wxODDEVEN_RULE;
+    PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO|lli:wxDC_DrawPolygon",&_argc0,&_obj2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"OO|lli:wxDC_DrawPolygon",&_argo0,&_obj2,&_arg3,&_arg4,&_arg5)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawPolygon. Expected _wxDC_p.");
         return NULL;
         }
@@ -3385,13 +3641,14 @@ static PyObject *_wrap_wxDC_DrawPoint(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     long  _arg1;
     long  _arg2;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sll:wxDC_DrawPoint",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxDC_DrawPoint",&_argo0,&_arg1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawPoint. Expected _wxDC_p.");
         return NULL;
         }
@@ -3414,13 +3671,14 @@ static PyObject *_wrap_wxDC_DrawRectangle(PyObject *self, PyObject *args) {
     long  _arg2;
     long  _arg3;
     long  _arg4;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sllll:wxDC_DrawRectangle",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"Ollll:wxDC_DrawRectangle",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawRectangle. Expected _wxDC_p.");
         return NULL;
         }
@@ -3443,14 +3701,15 @@ static PyObject *_wrap_wxDC_DrawRoundedRectangle(PyObject *self, PyObject *args)
     long  _arg2;
     long  _arg3;
     long  _arg4;
-    long  _arg5 = 20;
-    char * _argc0 = 0;
+    long  _arg5 = (long ) 20;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sllll|l:wxDC_DrawRoundedRectangle",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"Ollll|l:wxDC_DrawRoundedRectangle",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawRoundedRectangle. Expected _wxDC_p.");
         return NULL;
         }
@@ -3471,14 +3730,15 @@ static PyObject *_wrap_wxDC_DrawSpline(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     int  _arg1;
     wxPoint * _arg2;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxDC_DrawSpline",&_argc0,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_DrawSpline",&_argo0,&_obj2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawSpline. Expected _wxDC_p.");
         return NULL;
         }
@@ -3518,14 +3778,15 @@ static PyObject *_wrap_wxDC_DrawText(PyObject *self, PyObject *args) {
     wxString * _arg1;
     long  _arg2;
     long  _arg3;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sOll:wxDC_DrawText",&_argc0,&_obj1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"OOll:wxDC_DrawText",&_argo0,&_obj1,&_arg2,&_arg3)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawText. Expected _wxDC_p.");
         return NULL;
         }
@@ -3555,13 +3816,14 @@ static PyObject *_wrap_wxDC_DrawText(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_EndDoc(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_EndDoc",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_EndDoc",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_EndDoc. Expected _wxDC_p.");
         return NULL;
         }
@@ -3580,13 +3842,14 @@ static PyObject *_wrap_wxDC_EndDoc(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_EndDrawing(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_EndDrawing",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_EndDrawing",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_EndDrawing. Expected _wxDC_p.");
         return NULL;
         }
@@ -3605,13 +3868,14 @@ static PyObject *_wrap_wxDC_EndDrawing(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_EndPage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_EndPage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_EndPage",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_EndPage. Expected _wxDC_p.");
         return NULL;
         }
@@ -3633,21 +3897,23 @@ static PyObject *_wrap_wxDC_FloodFill(PyObject *self, PyObject *args) {
     long  _arg1;
     long  _arg2;
     wxColour * _arg3;
-    int  _arg4 = (wxFLOOD_SURFACE);
-    char * _argc0 = 0;
-    char * _argc3 = 0;
+    int  _arg4 = (int ) wxFLOOD_SURFACE;
+    PyObject * _argo0 = 0;
+    PyObject * _argo3 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"slls|i:wxDC_FloodFill",&_argc0,&_arg1,&_arg2,&_argc3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"OllO|i:wxDC_FloodFill",&_argo0,&_arg1,&_arg2,&_argo3,&_arg4)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_FloodFill. Expected _wxDC_p.");
         return NULL;
         }
     }
-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxColour_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxDC_FloodFill. Expected _wxColour_p.");
         return NULL;
         }
@@ -3667,14 +3933,15 @@ static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBrush * _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_GetBackground",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetBackground",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetBackground. Expected _wxDC_p.");
         return NULL;
         }
@@ -3685,8 +3952,13 @@ static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) {
     _result = (wxBrush *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3695,14 +3967,15 @@ static PyObject *_wrap_wxDC_GetBrush(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBrush * _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_GetBrush",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetBrush",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetBrush. Expected _wxDC_p.");
         return NULL;
         }
@@ -3713,8 +3986,13 @@ static PyObject *_wrap_wxDC_GetBrush(PyObject *self, PyObject *args) {
     _result = (wxBrush *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3723,13 +4001,14 @@ static PyObject *_wrap_wxDC_GetCharHeight(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_GetCharHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetCharHeight",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetCharHeight. Expected _wxDC_p.");
         return NULL;
         }
@@ -3748,13 +4027,14 @@ static PyObject *_wrap_wxDC_GetCharWidth(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_GetCharWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetCharWidth",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetCharWidth. Expected _wxDC_p.");
         return NULL;
         }
@@ -3780,7 +4060,7 @@ static PyObject *_wrap_wxDC_GetClippingBox(PyObject *self, PyObject *args) {
     long  temp1;
     long * _arg4;
     long  temp2;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
 {
@@ -3795,10 +4075,11 @@ static PyObject *_wrap_wxDC_GetClippingBox(PyObject *self, PyObject *args) {
 {
   _arg4 = &temp2;
 }
-    if(!PyArg_ParseTuple(args,"s:wxDC_GetClippingBox",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetClippingBox",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetClippingBox. Expected _wxDC_p.");
         return NULL;
         }
@@ -3838,14 +4119,15 @@ static PyObject *_wrap_wxDC_GetFont(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxFont * _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_GetFont",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetFont",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetFont. Expected _wxDC_p.");
         return NULL;
         }
@@ -3856,8 +4138,13 @@ static PyObject *_wrap_wxDC_GetFont(PyObject *self, PyObject *args) {
     _result = (wxFont *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3866,13 +4153,14 @@ static PyObject *_wrap_wxDC_GetLogicalFunction(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_GetLogicalFunction",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetLogicalFunction",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetLogicalFunction. Expected _wxDC_p.");
         return NULL;
         }
@@ -3891,13 +4179,14 @@ static PyObject *_wrap_wxDC_GetMapMode(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_GetMapMode",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetMapMode",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetMapMode. Expected _wxDC_p.");
         return NULL;
         }
@@ -3916,13 +4205,14 @@ static PyObject *_wrap_wxDC_GetOptimization(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_GetOptimization",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetOptimization",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetOptimization. Expected _wxDC_p.");
         return NULL;
         }
@@ -3941,14 +4231,15 @@ static PyObject *_wrap_wxDC_GetPen(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPen * _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_GetPen",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetPen",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetPen. Expected _wxDC_p.");
         return NULL;
         }
@@ -3959,8 +4250,13 @@ static PyObject *_wrap_wxDC_GetPen(PyObject *self, PyObject *args) {
     _result = (wxPen *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -3975,14 +4271,15 @@ static PyObject *_wrap_wxDC_GetPixel(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     long  _arg1;
     long  _arg2;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sll:wxDC_GetPixel",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxDC_GetPixel",&_argo0,&_arg1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetPixel. Expected _wxDC_p.");
         return NULL;
         }
@@ -3992,20 +4289,25 @@ static PyObject *_wrap_wxDC_GetPixel(PyObject *self, PyObject *args) {
         _result = (wxColour *)wxDC_GetPixel(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
-#define wxDC_GetSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxDC_GetSize(PyObject *self, PyObject *args) {
+#define wxDC_GetSizeTuple(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetSize(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxDC_GetSizeTuple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     int * _arg1;
     int  temp;
     int * _arg2;
     int  temp0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
 {
@@ -4014,17 +4316,18 @@ static PyObject *_wrap_wxDC_GetSize(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"s:wxDC_GetSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetSizeTuple",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetSize. Expected _wxDC_p.");
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetSizeTuple. Expected _wxDC_p.");
         return NULL;
         }
     }
 {
     wxPy_BEGIN_ALLOW_THREADS;
-        wxDC_GetSize(_arg0,_arg1,_arg2);
+        wxDC_GetSizeTuple(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
 }    Py_INCREF(Py_None);
@@ -4042,19 +4345,48 @@ static PyObject *_wrap_wxDC_GetSize(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxDC_GetSize(_swigobj)  (_swigobj->GetSize())
+static PyObject *_wrap_wxDC_GetSize(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxSize * _result;
+    wxDC * _arg0;
+    PyObject * _argo0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetSize",&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetSize. Expected _wxDC_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxSize (wxDC_GetSize(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
 #define wxDC_GetTextBackground(_swigobj)  (_swigobj->GetTextBackground())
 static PyObject *_wrap_wxDC_GetTextBackground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_GetTextBackground",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetTextBackground",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetTextBackground. Expected _wxDC_p.");
         return NULL;
         }
@@ -4065,8 +4397,13 @@ static PyObject *_wrap_wxDC_GetTextBackground(PyObject *self, PyObject *args) {
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -4079,7 +4416,7 @@ static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) {
     long  temp;
     long * _arg3;
     long  temp0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
 
     self = self;
@@ -4089,10 +4426,11 @@ static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) {
 {
   _arg3 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"sO:wxDC_GetTextExtent",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_GetTextExtent",&_argo0,&_obj1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetTextExtent. Expected _wxDC_p.");
         return NULL;
         }
@@ -4141,10 +4479,10 @@ static PyObject *_wrap_wxDC_GetFullTextExtent(PyObject *self, PyObject *args) {
     long  temp1;
     long * _arg5;
     long  temp2;
-    wxFont * _arg6 = NULL;
-    char * _argc0 = 0;
+    wxFont * _arg6 = (wxFont *) NULL;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
-    char * _argc6 = 0;
+    PyObject * _argo6 = 0;
 
     self = self;
 {
@@ -4159,10 +4497,11 @@ static PyObject *_wrap_wxDC_GetFullTextExtent(PyObject *self, PyObject *args) {
 {
   _arg5 = &temp2;
 }
-    if(!PyArg_ParseTuple(args,"sO|s:wxDC_GetFullTextExtent",&_argc0,&_obj1,&_argc6)) 
+    if(!PyArg_ParseTuple(args,"OO|O:wxDC_GetFullTextExtent",&_argo0,&_obj1,&_argo6)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetFullTextExtent. Expected _wxDC_p.");
         return NULL;
         }
@@ -4174,8 +4513,9 @@ static PyObject *_wrap_wxDC_GetFullTextExtent(PyObject *self, PyObject *args) {
     }
     _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
-    if (_argc6) {
-        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxFont_p")) {
+    if (_argo6) {
+        if (_argo6 == Py_None) { _arg6 = NULL; }
+        else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxDC_GetFullTextExtent. Expected _wxFont_p.");
         return NULL;
         }
@@ -4219,14 +4559,15 @@ static PyObject *_wrap_wxDC_GetTextForeground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxColour * _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_GetTextForeground",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_GetTextForeground",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetTextForeground. Expected _wxDC_p.");
         return NULL;
         }
@@ -4237,8 +4578,13 @@ static PyObject *_wrap_wxDC_GetTextForeground(PyObject *self, PyObject *args) {
     _result = (wxColour *) &_result_ref;
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -4248,13 +4594,14 @@ static PyObject *_wrap_wxDC_LogicalToDeviceX(PyObject *self, PyObject *args) {
     long  _result;
     wxDC * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxDC_LogicalToDeviceX",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_LogicalToDeviceX",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_LogicalToDeviceX. Expected _wxDC_p.");
         return NULL;
         }
@@ -4274,13 +4621,14 @@ static PyObject *_wrap_wxDC_LogicalToDeviceXRel(PyObject *self, PyObject *args)
     long  _result;
     wxDC * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxDC_LogicalToDeviceXRel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_LogicalToDeviceXRel",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_LogicalToDeviceXRel. Expected _wxDC_p.");
         return NULL;
         }
@@ -4300,13 +4648,14 @@ static PyObject *_wrap_wxDC_LogicalToDeviceY(PyObject *self, PyObject *args) {
     long  _result;
     wxDC * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxDC_LogicalToDeviceY",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_LogicalToDeviceY",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_LogicalToDeviceY. Expected _wxDC_p.");
         return NULL;
         }
@@ -4326,13 +4675,14 @@ static PyObject *_wrap_wxDC_LogicalToDeviceYRel(PyObject *self, PyObject *args)
     long  _result;
     wxDC * _arg0;
     long  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sl:wxDC_LogicalToDeviceYRel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Ol:wxDC_LogicalToDeviceYRel",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_LogicalToDeviceYRel. Expected _wxDC_p.");
         return NULL;
         }
@@ -4351,13 +4701,14 @@ static PyObject *_wrap_wxDC_MaxX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_MaxX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_MaxX",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_MaxX. Expected _wxDC_p.");
         return NULL;
         }
@@ -4376,13 +4727,14 @@ static PyObject *_wrap_wxDC_MaxY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_MaxY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_MaxY",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_MaxY. Expected _wxDC_p.");
         return NULL;
         }
@@ -4401,13 +4753,14 @@ static PyObject *_wrap_wxDC_MinX(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_MinX",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_MinX",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_MinX. Expected _wxDC_p.");
         return NULL;
         }
@@ -4426,13 +4779,14 @@ static PyObject *_wrap_wxDC_MinY(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_MinY",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_MinY",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_MinY. Expected _wxDC_p.");
         return NULL;
         }
@@ -4451,13 +4805,14 @@ static PyObject *_wrap_wxDC_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_Ok",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_Ok. Expected _wxDC_p.");
         return NULL;
         }
@@ -4477,13 +4832,14 @@ static PyObject *_wrap_wxDC_SetDeviceOrigin(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     long  _arg1;
     long  _arg2;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sll:wxDC_SetDeviceOrigin",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Oll:wxDC_SetDeviceOrigin",&_argo0,&_arg1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetDeviceOrigin. Expected _wxDC_p.");
         return NULL;
         }
@@ -4503,20 +4859,22 @@ static PyObject *_wrap_wxDC_SetBackground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxBrush * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetBackground",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetBackground",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetBackground. Expected _wxDC_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBrush_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBrush_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetBackground. Expected _wxBrush_p.");
         return NULL;
         }
@@ -4536,13 +4894,14 @@ static PyObject *_wrap_wxDC_SetBackgroundMode(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxDC_SetBackgroundMode",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxDC_SetBackgroundMode",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetBackgroundMode. Expected _wxDC_p.");
         return NULL;
         }
@@ -4565,13 +4924,14 @@ static PyObject *_wrap_wxDC_SetClippingRegion(PyObject *self, PyObject *args) {
     long  _arg2;
     long  _arg3;
     long  _arg4;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sllll:wxDC_SetClippingRegion",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"Ollll:wxDC_SetClippingRegion",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetClippingRegion. Expected _wxDC_p.");
         return NULL;
         }
@@ -4591,20 +4951,22 @@ static PyObject *_wrap_wxDC_SetPalette(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxPalette * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetPalette",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetPalette",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetPalette. Expected _wxDC_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPalette_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPalette_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetPalette. Expected _wxPalette_p.");
         return NULL;
         }
@@ -4624,20 +4986,22 @@ static PyObject *_wrap_wxDC_SetBrush(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxBrush * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetBrush",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetBrush",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetBrush. Expected _wxDC_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBrush_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBrush_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetBrush. Expected _wxBrush_p.");
         return NULL;
         }
@@ -4657,20 +5021,22 @@ static PyObject *_wrap_wxDC_SetFont(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxFont * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetFont",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetFont",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetFont. Expected _wxDC_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxFont_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetFont. Expected _wxFont_p.");
         return NULL;
         }
@@ -4690,13 +5056,14 @@ static PyObject *_wrap_wxDC_SetLogicalFunction(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxDC_SetLogicalFunction",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxDC_SetLogicalFunction",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetLogicalFunction. Expected _wxDC_p.");
         return NULL;
         }
@@ -4716,13 +5083,14 @@ static PyObject *_wrap_wxDC_SetMapMode(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxDC_SetMapMode",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxDC_SetMapMode",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetMapMode. Expected _wxDC_p.");
         return NULL;
         }
@@ -4742,14 +5110,15 @@ static PyObject *_wrap_wxDC_SetOptimization(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     bool  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     int tempbool1;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxDC_SetOptimization",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxDC_SetOptimization",&_argo0,&tempbool1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetOptimization. Expected _wxDC_p.");
         return NULL;
         }
@@ -4770,20 +5139,22 @@ static PyObject *_wrap_wxDC_SetPen(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxPen * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetPen",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetPen",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetPen. Expected _wxDC_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPen_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPen_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetPen. Expected _wxPen_p.");
         return NULL;
         }
@@ -4803,20 +5174,22 @@ static PyObject *_wrap_wxDC_SetTextBackground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxColour * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetTextBackground",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetTextBackground",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetTextBackground. Expected _wxDC_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetTextBackground. Expected _wxColour_p.");
         return NULL;
         }
@@ -4836,20 +5209,22 @@ static PyObject *_wrap_wxDC_SetTextForeground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxColour * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxDC_SetTextForeground",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_SetTextForeground",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetTextForeground. Expected _wxDC_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_SetTextForeground. Expected _wxColour_p.");
         return NULL;
         }
@@ -4870,13 +5245,14 @@ static PyObject *_wrap_wxDC_SetUserScale(PyObject *self, PyObject *args) {
     wxDC * _arg0;
     double  _arg1;
     double  _arg2;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sdd:wxDC_SetUserScale",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"Odd:wxDC_SetUserScale",&_argo0,&_arg1,&_arg2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetUserScale. Expected _wxDC_p.");
         return NULL;
         }
@@ -4897,14 +5273,15 @@ static PyObject *_wrap_wxDC_StartDoc(PyObject *self, PyObject *args) {
     bool  _result;
     wxDC * _arg0;
     wxString * _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxDC_StartDoc",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxDC_StartDoc",&_argo0,&_obj1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_StartDoc. Expected _wxDC_p.");
         return NULL;
         }
@@ -4933,13 +5310,14 @@ static PyObject *_wrap_wxDC_StartDoc(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_StartPage(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxDC_StartPage",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxDC_StartPage",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_StartPage. Expected _wxDC_p.");
         return NULL;
         }
@@ -4957,8 +5335,10 @@ static PyObject *_wrap_wxDC_StartPage(PyObject *self, PyObject *args) {
 static void  wxDC_DrawBitmap(wxDC *self,wxBitmap & bitmap,long  x,long  y,bool  swapPalette) {
             wxMemoryDC* memDC = new wxMemoryDC;
             memDC->SelectObject(bitmap);
+#ifdef __WXMSW__
             if (swapPalette)
                 self->SetPalette(*bitmap.GetPalette());
+#endif
             self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC,
                     0, 0, self->GetLogicalFunction());
             memDC->SelectObject(wxNullBitmap);
@@ -4970,22 +5350,24 @@ static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args) {
     wxBitmap * _arg1;
     long  _arg2;
     long  _arg3;
-    bool  _arg4 = (1);
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-    int tempbool4;
+    bool  _arg4 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    int tempbool4 = (int) TRUE;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ssll|i:wxDC_DrawBitmap",&_argc0,&_argc1,&_arg2,&_arg3,&tempbool4)) 
+    if(!PyArg_ParseTuple(args,"OOll|i:wxDC_DrawBitmap",&_argo0,&_argo1,&_arg2,&_arg3,&tempbool4)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_DrawBitmap. Expected _wxDC_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxDC_DrawBitmap. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -5023,8 +5405,13 @@ static PyObject *_wrap_new_wxMemoryDC(PyObject *self, PyObject *args) {
         _result = (wxMemoryDC *)new_wxMemoryDC();
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMemoryDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxMemoryDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -5033,20 +5420,22 @@ static PyObject *_wrap_wxMemoryDC_SelectObject(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMemoryDC * _arg0;
     wxBitmap * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxMemoryDC_SelectObject",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxMemoryDC_SelectObject",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMemoryDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMemoryDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMemoryDC_SelectObject. Expected _wxMemoryDC_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMemoryDC_SelectObject. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -5083,8 +5472,13 @@ static PyObject *_wrap_new_wxScreenDC(PyObject *self, PyObject *args) {
         _result = (wxScreenDC *)new_wxScreenDC();
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxScreenDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxScreenDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -5094,20 +5488,22 @@ static PyObject *_wrap_wxScreenDC_StartDrawingOnTop(PyObject *self, PyObject *ar
     bool  _result;
     wxScreenDC * _arg0;
     wxWindow * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxScreenDC_StartDrawingOnTop",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxScreenDC_StartDrawingOnTop",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScreenDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScreenDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScreenDC_StartDrawingOnTop. Expected _wxScreenDC_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 wxScreenDC_StartDrawingOnTop. Expected _wxWindow_p.");
         return NULL;
         }
@@ -5126,21 +5522,23 @@ static PyObject *_wrap_wxScreenDC_StartDrawingOnTopRect(PyObject *self, PyObject
     PyObject * _resultobj;
     bool  _result;
     wxScreenDC * _arg0;
-    wxRect * _arg1 = NULL;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    wxRect * _arg1 = (wxRect *) NULL;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|s:wxScreenDC_StartDrawingOnTopRect",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"O|O:wxScreenDC_StartDrawingOnTopRect",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScreenDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScreenDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScreenDC_StartDrawingOnTopRect. Expected _wxScreenDC_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 wxScreenDC_StartDrawingOnTopRect. Expected _wxRect_p.");
         return NULL;
         }
@@ -5159,13 +5557,14 @@ static PyObject *_wrap_wxScreenDC_EndDrawingOnTop(PyObject *self, PyObject *args
     PyObject * _resultobj;
     bool  _result;
     wxScreenDC * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxScreenDC_EndDrawingOnTop",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxScreenDC_EndDrawingOnTop",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScreenDC_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScreenDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScreenDC_EndDrawingOnTop. Expected _wxScreenDC_p.");
         return NULL;
         }
@@ -5192,14 +5591,15 @@ static PyObject *_wrap_new_wxClientDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxClientDC * _result;
     wxWindow * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:new_wxClientDC",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:new_wxClientDC",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxClientDC. Expected _wxWindow_p.");
         return NULL;
         }
@@ -5209,8 +5609,13 @@ static PyObject *_wrap_new_wxClientDC(PyObject *self, PyObject *args) {
         _result = (wxClientDC *)new_wxClientDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxClientDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxClientDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -5227,14 +5632,15 @@ static PyObject *_wrap_new_wxPaintDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPaintDC * _result;
     wxWindow * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:new_wxPaintDC",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:new_wxPaintDC",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPaintDC. Expected _wxWindow_p.");
         return NULL;
         }
@@ -5244,8 +5650,13 @@ static PyObject *_wrap_new_wxPaintDC(PyObject *self, PyObject *args) {
         _result = (wxPaintDC *)new_wxPaintDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPaintDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPaintDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -5262,14 +5673,15 @@ static PyObject *_wrap_new_wxWindowDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindowDC * _result;
     wxWindow * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:new_wxWindowDC",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:new_wxWindowDC",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxWindowDC. Expected _wxWindow_p.");
         return NULL;
         }
@@ -5279,8 +5691,13 @@ static PyObject *_wrap_new_wxWindowDC(PyObject *self, PyObject *args) {
         _result = (wxWindowDC *)new_wxWindowDC(_arg0);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindowDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindowDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -5297,15 +5714,15 @@ static PyObject *_wrap_new_wxPostScriptDC(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPostScriptDC * _result;
     wxString * _arg0;
-    bool  _arg1 = (1);
-    wxWindow * _arg2 = NULL;
+    bool  _arg1 = (bool ) TRUE;
+    wxWindow * _arg2 = (wxWindow *) NULL;
     PyObject * _obj0 = 0;
-    int tempbool1;
-    char * _argc2 = 0;
+    int tempbool1 = (int) TRUE;
+    PyObject * _argo2 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|is:new_wxPostScriptDC",&_obj0,&tempbool1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"O|iO:new_wxPostScriptDC",&_obj0,&tempbool1,&_argo2)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -5315,8 +5732,9 @@ static PyObject *_wrap_new_wxPostScriptDC(PyObject *self, PyObject *args) {
     _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
 }
     _arg1 = (bool ) tempbool1;
-    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 new_wxPostScriptDC. Expected _wxWindow_p.");
         return NULL;
         }
@@ -5326,8 +5744,13 @@ static PyObject *_wrap_new_wxPostScriptDC(PyObject *self, PyObject *args) {
         _result = (wxPostScriptDC *)new_wxPostScriptDC(*_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPostScriptDC_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPostScriptDC_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
 {
     if (_obj0)
         delete _arg0;
@@ -5383,8 +5806,13 @@ static PyObject *_wrap_new_wxPalette(PyObject *self, PyObject *args) {
         _result = (wxPalette *)new_wxPalette(_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPalette_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPalette_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
 {
     delete [] _arg1;
 }
@@ -5401,13 +5829,14 @@ static PyObject *_wrap_new_wxPalette(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxPalette(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxPalette * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxPalette",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxPalette",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPalette_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPalette. Expected _wxPalette_p.");
         return NULL;
         }
@@ -5430,13 +5859,14 @@ static PyObject *_wrap_wxPalette_GetPixel(PyObject *self, PyObject *args) {
     byte  _arg1;
     byte  _arg2;
     byte  _arg3;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sbbb:wxPalette_GetPixel",&_argc0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTuple(args,"Obbb:wxPalette_GetPixel",&_argo0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPalette_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetPixel. Expected _wxPalette_p.");
         return NULL;
         }
@@ -5459,34 +5889,38 @@ static PyObject *_wrap_wxPalette_GetRGB(PyObject *self, PyObject *args) {
     byte * _arg2;
     byte * _arg3;
     byte * _arg4;
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
-    char * _argc4 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _argo3 = 0;
+    PyObject * _argo4 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sisss:wxPalette_GetRGB",&_argc0,&_arg1,&_argc2,&_argc3,&_argc4)) 
+    if(!PyArg_ParseTuple(args,"OiOOO:wxPalette_GetRGB",&_argo0,&_arg1,&_argo2,&_argo3,&_argo4)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPalette_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetRGB. Expected _wxPalette_p.");
         return NULL;
         }
     }
-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_byte_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_byte_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPalette_GetRGB. Expected _byte_p.");
         return NULL;
         }
     }
-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_byte_p")) {
+    if (_argo3) {
+        if (_argo3 == Py_None) { _arg3 = NULL; }
+        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_byte_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxPalette_GetRGB. Expected _byte_p.");
         return NULL;
         }
     }
-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_byte_p")) {
+    if (_argo4) {
+        if (_argo4 == Py_None) { _arg4 = NULL; }
+        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_byte_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxPalette_GetRGB. Expected _byte_p.");
         return NULL;
         }
@@ -5505,13 +5939,14 @@ static PyObject *_wrap_wxPalette_Ok(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxPalette * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxPalette_Ok",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxPalette_Ok",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPalette_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_Ok. Expected _wxPalette_p.");
         return NULL;
         }
@@ -5531,9 +5966,9 @@ static PyObject *_wrap_new_wxImageList(PyObject *self, PyObject *args) {
     wxImageList * _result;
     int  _arg0;
     int  _arg1;
-    bool  _arg2 = (1);
-    int  _arg3 = 1;
-    int tempbool2;
+    bool  _arg2 = (bool ) TRUE;
+    int  _arg3 = (int ) 1;
+    int tempbool2 = (int) TRUE;
     char _ptemp[128];
 
     self = self;
@@ -5545,8 +5980,13 @@ static PyObject *_wrap_new_wxImageList(PyObject *self, PyObject *args) {
         _result = (wxImageList *)new_wxImageList(_arg0,_arg1,_arg2,_arg3);
 
     wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
     return _resultobj;
 }
 
@@ -5554,13 +5994,14 @@ static PyObject *_wrap_new_wxImageList(PyObject *self, PyObject *args) {
 static PyObject *_wrap_delete_wxImageList(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxImageList * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:delete_wxImageList",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:delete_wxImageList",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxImageList. Expected _wxImageList_p.");
         return NULL;
         }
@@ -5581,20 +6022,22 @@ static PyObject *_wrap_wxImageList_Add(PyObject *self, PyObject *args) {
     int  _result;
     wxImageList * _arg0;
     wxBitmap * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxImageList_Add",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxImageList_Add",&_argo0,&_argo1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Add. Expected _wxImageList_p.");
         return NULL;
         }
     }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxImageList_Add. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -5615,20 +6058,22 @@ static PyObject *_wrap_wxImageList_Replace(PyObject *self, PyObject *args) {
     wxImageList * _arg0;
     int  _arg1;
     wxBitmap * _arg2;
-    char * _argc0 = 0;
-    char * _argc2 = 0;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sis:wxImageList_Replace",&_argc0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"OiO:wxImageList_Replace",&_argo0,&_arg1,&_argo2)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Replace. Expected _wxImageList_p.");
         return NULL;
         }
     }
-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Replace. Expected _wxBitmap_p.");
         return NULL;
         }
@@ -5651,23 +6096,25 @@ static PyObject *_wrap_wxImageList_Draw(PyObject *self, PyObject *args) {
     wxDC * _arg2;
     int  _arg3;
     int  _arg4;
-    int  _arg5 = (wxIMAGELIST_DRAW_NORMAL);
-    bool  _arg6 = (0);
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    int tempbool6;
+    int  _arg5 = (int ) (wxIMAGELIST_DRAW_NORMAL);
+    bool  _arg6 = (bool ) FALSE;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    int tempbool6 = (int) FALSE;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sisii|ii:wxImageList_Draw",&_argc0,&_arg1,&_argc2,&_arg3,&_arg4,&_arg5,&tempbool6)) 
+    if(!PyArg_ParseTuple(args,"OiOii|ii:wxImageList_Draw",&_argo0,&_arg1,&_argo2,&_arg3,&_arg4,&_arg5,&tempbool6)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Draw. Expected _wxImageList_p.");
         return NULL;
         }
     }
-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxDC_p")) {
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxDC_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Draw. Expected _wxDC_p.");
         return NULL;
         }
@@ -5687,13 +6134,14 @@ static PyObject *_wrap_wxImageList_GetImageCount(PyObject *self, PyObject *args)
     PyObject * _resultobj;
     int  _result;
     wxImageList * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxImageList_GetImageCount",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImageList_GetImageCount",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_GetImageCount. Expected _wxImageList_p.");
         return NULL;
         }
@@ -5713,13 +6161,14 @@ static PyObject *_wrap_wxImageList_Remove(PyObject *self, PyObject *args) {
     bool  _result;
     wxImageList * _arg0;
     int  _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxImageList_Remove",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"Oi:wxImageList_Remove",&_argo0,&_arg1)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Remove. Expected _wxImageList_p.");
         return NULL;
         }
@@ -5738,13 +6187,14 @@ static PyObject *_wrap_wxImageList_RemoveAll(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxImageList * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxImageList_RemoveAll",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxImageList_RemoveAll",&_argo0)) 
         return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) {
             PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_RemoveAll. Expected _wxImageList_p.");
         return NULL;
         }
@@ -5759,178 +6209,342 @@ static PyObject *_wrap_wxImageList_RemoveAll(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef gdicMethods[] = {
-        { "wxImageList_RemoveAll", _wrap_wxImageList_RemoveAll, 1 },
-        { "wxImageList_Remove", _wrap_wxImageList_Remove, 1 },
-        { "wxImageList_GetImageCount", _wrap_wxImageList_GetImageCount, 1 },
-        { "wxImageList_Draw", _wrap_wxImageList_Draw, 1 },
-        { "wxImageList_Replace", _wrap_wxImageList_Replace, 1 },
-        { "wxImageList_Add", _wrap_wxImageList_Add, 1 },
-        { "delete_wxImageList", _wrap_delete_wxImageList, 1 },
-        { "new_wxImageList", _wrap_new_wxImageList, 1 },
-        { "wxPalette_Ok", _wrap_wxPalette_Ok, 1 },
-        { "wxPalette_GetRGB", _wrap_wxPalette_GetRGB, 1 },
-        { "wxPalette_GetPixel", _wrap_wxPalette_GetPixel, 1 },
-        { "delete_wxPalette", _wrap_delete_wxPalette, 1 },
-        { "new_wxPalette", _wrap_new_wxPalette, 1 },
-        { "new_wxPostScriptDC", _wrap_new_wxPostScriptDC, 1 },
-        { "new_wxWindowDC", _wrap_new_wxWindowDC, 1 },
-        { "new_wxPaintDC", _wrap_new_wxPaintDC, 1 },
-        { "new_wxClientDC", _wrap_new_wxClientDC, 1 },
-        { "wxScreenDC_EndDrawingOnTop", _wrap_wxScreenDC_EndDrawingOnTop, 1 },
-        { "wxScreenDC_StartDrawingOnTopRect", _wrap_wxScreenDC_StartDrawingOnTopRect, 1 },
-        { "wxScreenDC_StartDrawingOnTop", _wrap_wxScreenDC_StartDrawingOnTop, 1 },
-        { "new_wxScreenDC", _wrap_new_wxScreenDC, 1 },
-        { "wxMemoryDC_SelectObject", _wrap_wxMemoryDC_SelectObject, 1 },
-        { "new_wxMemoryDC", _wrap_new_wxMemoryDC, 1 },
-        { "wxDC_DrawBitmap", _wrap_wxDC_DrawBitmap, 1 },
-        { "wxDC_StartPage", _wrap_wxDC_StartPage, 1 },
-        { "wxDC_StartDoc", _wrap_wxDC_StartDoc, 1 },
-        { "wxDC_SetUserScale", _wrap_wxDC_SetUserScale, 1 },
-        { "wxDC_SetTextForeground", _wrap_wxDC_SetTextForeground, 1 },
-        { "wxDC_SetTextBackground", _wrap_wxDC_SetTextBackground, 1 },
-        { "wxDC_SetPen", _wrap_wxDC_SetPen, 1 },
-        { "wxDC_SetOptimization", _wrap_wxDC_SetOptimization, 1 },
-        { "wxDC_SetMapMode", _wrap_wxDC_SetMapMode, 1 },
-        { "wxDC_SetLogicalFunction", _wrap_wxDC_SetLogicalFunction, 1 },
-        { "wxDC_SetFont", _wrap_wxDC_SetFont, 1 },
-        { "wxDC_SetBrush", _wrap_wxDC_SetBrush, 1 },
-        { "wxDC_SetPalette", _wrap_wxDC_SetPalette, 1 },
-        { "wxDC_SetClippingRegion", _wrap_wxDC_SetClippingRegion, 1 },
-        { "wxDC_SetBackgroundMode", _wrap_wxDC_SetBackgroundMode, 1 },
-        { "wxDC_SetBackground", _wrap_wxDC_SetBackground, 1 },
-        { "wxDC_SetDeviceOrigin", _wrap_wxDC_SetDeviceOrigin, 1 },
-        { "wxDC_Ok", _wrap_wxDC_Ok, 1 },
-        { "wxDC_MinY", _wrap_wxDC_MinY, 1 },
-        { "wxDC_MinX", _wrap_wxDC_MinX, 1 },
-        { "wxDC_MaxY", _wrap_wxDC_MaxY, 1 },
-        { "wxDC_MaxX", _wrap_wxDC_MaxX, 1 },
-        { "wxDC_LogicalToDeviceYRel", _wrap_wxDC_LogicalToDeviceYRel, 1 },
-        { "wxDC_LogicalToDeviceY", _wrap_wxDC_LogicalToDeviceY, 1 },
-        { "wxDC_LogicalToDeviceXRel", _wrap_wxDC_LogicalToDeviceXRel, 1 },
-        { "wxDC_LogicalToDeviceX", _wrap_wxDC_LogicalToDeviceX, 1 },
-        { "wxDC_GetTextForeground", _wrap_wxDC_GetTextForeground, 1 },
-        { "wxDC_GetFullTextExtent", _wrap_wxDC_GetFullTextExtent, 1 },
-        { "wxDC_GetTextExtent", _wrap_wxDC_GetTextExtent, 1 },
-        { "wxDC_GetTextBackground", _wrap_wxDC_GetTextBackground, 1 },
-        { "wxDC_GetSize", _wrap_wxDC_GetSize, 1 },
-        { "wxDC_GetPixel", _wrap_wxDC_GetPixel, 1 },
-        { "wxDC_GetPen", _wrap_wxDC_GetPen, 1 },
-        { "wxDC_GetOptimization", _wrap_wxDC_GetOptimization, 1 },
-        { "wxDC_GetMapMode", _wrap_wxDC_GetMapMode, 1 },
-        { "wxDC_GetLogicalFunction", _wrap_wxDC_GetLogicalFunction, 1 },
-        { "wxDC_GetFont", _wrap_wxDC_GetFont, 1 },
-        { "wxDC_GetClippingBox", _wrap_wxDC_GetClippingBox, 1 },
-        { "wxDC_GetCharWidth", _wrap_wxDC_GetCharWidth, 1 },
-        { "wxDC_GetCharHeight", _wrap_wxDC_GetCharHeight, 1 },
-        { "wxDC_GetBrush", _wrap_wxDC_GetBrush, 1 },
-        { "wxDC_GetBackground", _wrap_wxDC_GetBackground, 1 },
-        { "wxDC_FloodFill", _wrap_wxDC_FloodFill, 1 },
-        { "wxDC_EndPage", _wrap_wxDC_EndPage, 1 },
-        { "wxDC_EndDrawing", _wrap_wxDC_EndDrawing, 1 },
-        { "wxDC_EndDoc", _wrap_wxDC_EndDoc, 1 },
-        { "wxDC_DrawText", _wrap_wxDC_DrawText, 1 },
-        { "wxDC_DrawSpline", _wrap_wxDC_DrawSpline, 1 },
-        { "wxDC_DrawRoundedRectangle", _wrap_wxDC_DrawRoundedRectangle, 1 },
-        { "wxDC_DrawRectangle", _wrap_wxDC_DrawRectangle, 1 },
-        { "wxDC_DrawPoint", _wrap_wxDC_DrawPoint, 1 },
-        { "wxDC_DrawPolygon", _wrap_wxDC_DrawPolygon, 1 },
-        { "wxDC_DrawLines", _wrap_wxDC_DrawLines, 1 },
-        { "wxDC_DrawLine", _wrap_wxDC_DrawLine, 1 },
-        { "wxDC_DrawIcon", _wrap_wxDC_DrawIcon, 1 },
-        { "wxDC_DrawEllipticArc", _wrap_wxDC_DrawEllipticArc, 1 },
-        { "wxDC_DrawEllipse", _wrap_wxDC_DrawEllipse, 1 },
-        { "wxDC_DrawArc", _wrap_wxDC_DrawArc, 1 },
-        { "wxDC_DeviceToLogicalYRel", _wrap_wxDC_DeviceToLogicalYRel, 1 },
-        { "wxDC_DeviceToLogicalY", _wrap_wxDC_DeviceToLogicalY, 1 },
-        { "wxDC_DeviceToLogicalXRel", _wrap_wxDC_DeviceToLogicalXRel, 1 },
-        { "wxDC_DeviceToLogicalX", _wrap_wxDC_DeviceToLogicalX, 1 },
-        { "wxDC_DestroyClippingRegion", _wrap_wxDC_DestroyClippingRegion, 1 },
-        { "wxDC_CrossHair", _wrap_wxDC_CrossHair, 1 },
-        { "wxDC_Clear", _wrap_wxDC_Clear, 1 },
-        { "wxDC_Blit", _wrap_wxDC_Blit, 1 },
-        { "wxDC_BeginDrawing", _wrap_wxDC_BeginDrawing, 1 },
-        { "delete_wxDC", _wrap_delete_wxDC, 1 },
-        { "wxBrush_SetStyle", _wrap_wxBrush_SetStyle, 1 },
-        { "wxBrush_SetStipple", _wrap_wxBrush_SetStipple, 1 },
-        { "wxBrush_SetColour", _wrap_wxBrush_SetColour, 1 },
-        { "wxBrush_Ok", _wrap_wxBrush_Ok, 1 },
-        { "wxBrush_GetStyle", _wrap_wxBrush_GetStyle, 1 },
-        { "wxBrush_GetStipple", _wrap_wxBrush_GetStipple, 1 },
-        { "wxBrush_GetColour", _wrap_wxBrush_GetColour, 1 },
-        { "new_wxBrush", _wrap_new_wxBrush, 1 },
-        { "wxPen_SetWidth", _wrap_wxPen_SetWidth, 1 },
-        { "wxPen_SetStyle", _wrap_wxPen_SetStyle, 1 },
-        { "wxPen_SetJoin", _wrap_wxPen_SetJoin, 1 },
-        { "wxPen_SetColour", _wrap_wxPen_SetColour, 1 },
-        { "wxPen_SetCap", _wrap_wxPen_SetCap, 1 },
-        { "wxPen_Ok", _wrap_wxPen_Ok, 1 },
-        { "wxPen_GetWidth", _wrap_wxPen_GetWidth, 1 },
-        { "wxPen_GetStyle", _wrap_wxPen_GetStyle, 1 },
-        { "wxPen_GetJoin", _wrap_wxPen_GetJoin, 1 },
-        { "wxPen_GetColour", _wrap_wxPen_GetColour, 1 },
-        { "wxPen_GetCap", _wrap_wxPen_GetCap, 1 },
-        { "new_wxPen", _wrap_new_wxPen, 1 },
-        { "wxColour_Get", _wrap_wxColour_Get, 1 },
-        { "wxColour_Set", _wrap_wxColour_Set, 1 },
-        { "wxColour_Ok", _wrap_wxColour_Ok, 1 },
-        { "wxColour_Blue", _wrap_wxColour_Blue, 1 },
-        { "wxColour_Green", _wrap_wxColour_Green, 1 },
-        { "wxColour_Red", _wrap_wxColour_Red, 1 },
-        { "delete_wxColour", _wrap_delete_wxColour, 1 },
-        { "new_wxColour", _wrap_new_wxColour, 1 },
-        { "wxFont_SetWeight", _wrap_wxFont_SetWeight, 1 },
-        { "wxFont_SetUnderlined", _wrap_wxFont_SetUnderlined, 1 },
-        { "wxFont_SetStyle", _wrap_wxFont_SetStyle, 1 },
-        { "wxFont_SetPointSize", _wrap_wxFont_SetPointSize, 1 },
-        { "wxFont_SetFamily", _wrap_wxFont_SetFamily, 1 },
-        { "wxFont_SetFaceName", _wrap_wxFont_SetFaceName, 1 },
-        { "wxFont_GetWeight", _wrap_wxFont_GetWeight, 1 },
-        { "wxFont_GetUnderlined", _wrap_wxFont_GetUnderlined, 1 },
-        { "wxFont_GetStyle", _wrap_wxFont_GetStyle, 1 },
-        { "wxFont_GetPointSize", _wrap_wxFont_GetPointSize, 1 },
-        { "wxFont_GetFamily", _wrap_wxFont_GetFamily, 1 },
-        { "wxFont_GetFaceName", _wrap_wxFont_GetFaceName, 1 },
-        { "new_wxFont", _wrap_new_wxFont, 1 },
-        { "wxCursor_Ok", _wrap_wxCursor_Ok, 1 },
-        { "delete_wxCursor", _wrap_delete_wxCursor, 1 },
-        { "wxIcon_SetWidth", _wrap_wxIcon_SetWidth, 1 },
-        { "wxIcon_SetHeight", _wrap_wxIcon_SetHeight, 1 },
-        { "wxIcon_SetDepth", _wrap_wxIcon_SetDepth, 1 },
-        { "wxIcon_Ok", _wrap_wxIcon_Ok, 1 },
-        { "wxIcon_LoadFile", _wrap_wxIcon_LoadFile, 1 },
-        { "wxIcon_GetWidth", _wrap_wxIcon_GetWidth, 1 },
-        { "wxIcon_GetHeight", _wrap_wxIcon_GetHeight, 1 },
-        { "wxIcon_GetDepth", _wrap_wxIcon_GetDepth, 1 },
-        { "delete_wxIcon", _wrap_delete_wxIcon, 1 },
-        { "delete_wxMask", _wrap_delete_wxMask, 1 },
-        { "new_wxMask", _wrap_new_wxMask, 1 },
-        { "wxBitmap_SetWidth", _wrap_wxBitmap_SetWidth, 1 },
-        { "wxBitmap_SetMask", _wrap_wxBitmap_SetMask, 1 },
-        { "wxBitmap_SetHeight", _wrap_wxBitmap_SetHeight, 1 },
-        { "wxBitmap_SetDepth", _wrap_wxBitmap_SetDepth, 1 },
-        { "wxBitmap_SaveFile", _wrap_wxBitmap_SaveFile, 1 },
-        { "wxBitmap_Ok", _wrap_wxBitmap_Ok, 1 },
-        { "wxBitmap_LoadFile", _wrap_wxBitmap_LoadFile, 1 },
-        { "wxBitmap_GetWidth", _wrap_wxBitmap_GetWidth, 1 },
-        { "wxBitmap_GetMask", _wrap_wxBitmap_GetMask, 1 },
-        { "wxBitmap_GetPalette", _wrap_wxBitmap_GetPalette, 1 },
-        { "wxBitmap_GetHeight", _wrap_wxBitmap_GetHeight, 1 },
-        { "wxBitmap_GetDepth", _wrap_wxBitmap_GetDepth, 1 },
-        { "delete_wxBitmap", _wrap_delete_wxBitmap, 1 },
-        { "new_wxBitmap", _wrap_new_wxBitmap, 1 },
-        { "wxMemoryDCFromDC", _wrap_wxMemoryDCFromDC, 1 },
-        { "wxNamedColour", _wrap_wxNamedColour, 1 },
-        { "wxStockCursor", _wrap_wxStockCursor, 1 },
-        { "wxMaskColour", _wrap_wxMaskColour, 1 },
-        { "wxNoRefBitmap", _wrap_wxNoRefBitmap, 1 },
-        { "wxEmptyBitmap", _wrap_wxEmptyBitmap, 1 },
+        { "wxImageList_RemoveAll", _wrap_wxImageList_RemoveAll, METH_VARARGS },
+        { "wxImageList_Remove", _wrap_wxImageList_Remove, METH_VARARGS },
+        { "wxImageList_GetImageCount", _wrap_wxImageList_GetImageCount, METH_VARARGS },
+        { "wxImageList_Draw", _wrap_wxImageList_Draw, METH_VARARGS },
+        { "wxImageList_Replace", _wrap_wxImageList_Replace, METH_VARARGS },
+        { "wxImageList_Add", _wrap_wxImageList_Add, METH_VARARGS },
+        { "delete_wxImageList", _wrap_delete_wxImageList, METH_VARARGS },
+        { "new_wxImageList", _wrap_new_wxImageList, METH_VARARGS },
+        { "wxPalette_Ok", _wrap_wxPalette_Ok, METH_VARARGS },
+        { "wxPalette_GetRGB", _wrap_wxPalette_GetRGB, METH_VARARGS },
+        { "wxPalette_GetPixel", _wrap_wxPalette_GetPixel, METH_VARARGS },
+        { "delete_wxPalette", _wrap_delete_wxPalette, METH_VARARGS },
+        { "new_wxPalette", _wrap_new_wxPalette, METH_VARARGS },
+        { "new_wxPostScriptDC", _wrap_new_wxPostScriptDC, METH_VARARGS },
+        { "new_wxWindowDC", _wrap_new_wxWindowDC, METH_VARARGS },
+        { "new_wxPaintDC", _wrap_new_wxPaintDC, METH_VARARGS },
+        { "new_wxClientDC", _wrap_new_wxClientDC, METH_VARARGS },
+        { "wxScreenDC_EndDrawingOnTop", _wrap_wxScreenDC_EndDrawingOnTop, METH_VARARGS },
+        { "wxScreenDC_StartDrawingOnTopRect", _wrap_wxScreenDC_StartDrawingOnTopRect, METH_VARARGS },
+        { "wxScreenDC_StartDrawingOnTop", _wrap_wxScreenDC_StartDrawingOnTop, METH_VARARGS },
+        { "new_wxScreenDC", _wrap_new_wxScreenDC, METH_VARARGS },
+        { "wxMemoryDC_SelectObject", _wrap_wxMemoryDC_SelectObject, METH_VARARGS },
+        { "new_wxMemoryDC", _wrap_new_wxMemoryDC, METH_VARARGS },
+        { "wxDC_DrawBitmap", _wrap_wxDC_DrawBitmap, METH_VARARGS },
+        { "wxDC_StartPage", _wrap_wxDC_StartPage, METH_VARARGS },
+        { "wxDC_StartDoc", _wrap_wxDC_StartDoc, METH_VARARGS },
+        { "wxDC_SetUserScale", _wrap_wxDC_SetUserScale, METH_VARARGS },
+        { "wxDC_SetTextForeground", _wrap_wxDC_SetTextForeground, METH_VARARGS },
+        { "wxDC_SetTextBackground", _wrap_wxDC_SetTextBackground, METH_VARARGS },
+        { "wxDC_SetPen", _wrap_wxDC_SetPen, METH_VARARGS },
+        { "wxDC_SetOptimization", _wrap_wxDC_SetOptimization, METH_VARARGS },
+        { "wxDC_SetMapMode", _wrap_wxDC_SetMapMode, METH_VARARGS },
+        { "wxDC_SetLogicalFunction", _wrap_wxDC_SetLogicalFunction, METH_VARARGS },
+        { "wxDC_SetFont", _wrap_wxDC_SetFont, METH_VARARGS },
+        { "wxDC_SetBrush", _wrap_wxDC_SetBrush, METH_VARARGS },
+        { "wxDC_SetPalette", _wrap_wxDC_SetPalette, METH_VARARGS },
+        { "wxDC_SetClippingRegion", _wrap_wxDC_SetClippingRegion, METH_VARARGS },
+        { "wxDC_SetBackgroundMode", _wrap_wxDC_SetBackgroundMode, METH_VARARGS },
+        { "wxDC_SetBackground", _wrap_wxDC_SetBackground, METH_VARARGS },
+        { "wxDC_SetDeviceOrigin", _wrap_wxDC_SetDeviceOrigin, METH_VARARGS },
+        { "wxDC_Ok", _wrap_wxDC_Ok, METH_VARARGS },
+        { "wxDC_MinY", _wrap_wxDC_MinY, METH_VARARGS },
+        { "wxDC_MinX", _wrap_wxDC_MinX, METH_VARARGS },
+        { "wxDC_MaxY", _wrap_wxDC_MaxY, METH_VARARGS },
+        { "wxDC_MaxX", _wrap_wxDC_MaxX, METH_VARARGS },
+        { "wxDC_LogicalToDeviceYRel", _wrap_wxDC_LogicalToDeviceYRel, METH_VARARGS },
+        { "wxDC_LogicalToDeviceY", _wrap_wxDC_LogicalToDeviceY, METH_VARARGS },
+        { "wxDC_LogicalToDeviceXRel", _wrap_wxDC_LogicalToDeviceXRel, METH_VARARGS },
+        { "wxDC_LogicalToDeviceX", _wrap_wxDC_LogicalToDeviceX, METH_VARARGS },
+        { "wxDC_GetTextForeground", _wrap_wxDC_GetTextForeground, METH_VARARGS },
+        { "wxDC_GetFullTextExtent", _wrap_wxDC_GetFullTextExtent, METH_VARARGS },
+        { "wxDC_GetTextExtent", _wrap_wxDC_GetTextExtent, METH_VARARGS },
+        { "wxDC_GetTextBackground", _wrap_wxDC_GetTextBackground, METH_VARARGS },
+        { "wxDC_GetSize", _wrap_wxDC_GetSize, METH_VARARGS },
+        { "wxDC_GetSizeTuple", _wrap_wxDC_GetSizeTuple, METH_VARARGS },
+        { "wxDC_GetPixel", _wrap_wxDC_GetPixel, METH_VARARGS },
+        { "wxDC_GetPen", _wrap_wxDC_GetPen, METH_VARARGS },
+        { "wxDC_GetOptimization", _wrap_wxDC_GetOptimization, METH_VARARGS },
+        { "wxDC_GetMapMode", _wrap_wxDC_GetMapMode, METH_VARARGS },
+        { "wxDC_GetLogicalFunction", _wrap_wxDC_GetLogicalFunction, METH_VARARGS },
+        { "wxDC_GetFont", _wrap_wxDC_GetFont, METH_VARARGS },
+        { "wxDC_GetClippingBox", _wrap_wxDC_GetClippingBox, METH_VARARGS },
+        { "wxDC_GetCharWidth", _wrap_wxDC_GetCharWidth, METH_VARARGS },
+        { "wxDC_GetCharHeight", _wrap_wxDC_GetCharHeight, METH_VARARGS },
+        { "wxDC_GetBrush", _wrap_wxDC_GetBrush, METH_VARARGS },
+        { "wxDC_GetBackground", _wrap_wxDC_GetBackground, METH_VARARGS },
+        { "wxDC_FloodFill", _wrap_wxDC_FloodFill, METH_VARARGS },
+        { "wxDC_EndPage", _wrap_wxDC_EndPage, METH_VARARGS },
+        { "wxDC_EndDrawing", _wrap_wxDC_EndDrawing, METH_VARARGS },
+        { "wxDC_EndDoc", _wrap_wxDC_EndDoc, METH_VARARGS },
+        { "wxDC_DrawText", _wrap_wxDC_DrawText, METH_VARARGS },
+        { "wxDC_DrawSpline", _wrap_wxDC_DrawSpline, METH_VARARGS },
+        { "wxDC_DrawRoundedRectangle", _wrap_wxDC_DrawRoundedRectangle, METH_VARARGS },
+        { "wxDC_DrawRectangle", _wrap_wxDC_DrawRectangle, METH_VARARGS },
+        { "wxDC_DrawPoint", _wrap_wxDC_DrawPoint, METH_VARARGS },
+        { "wxDC_DrawPolygon", _wrap_wxDC_DrawPolygon, METH_VARARGS },
+        { "wxDC_DrawLines", _wrap_wxDC_DrawLines, METH_VARARGS },
+        { "wxDC_DrawLine", _wrap_wxDC_DrawLine, METH_VARARGS },
+        { "wxDC_DrawIcon", _wrap_wxDC_DrawIcon, METH_VARARGS },
+        { "wxDC_DrawEllipticArc", _wrap_wxDC_DrawEllipticArc, METH_VARARGS },
+        { "wxDC_DrawEllipse", _wrap_wxDC_DrawEllipse, METH_VARARGS },
+        { "wxDC_DrawCircle", _wrap_wxDC_DrawCircle, METH_VARARGS },
+        { "wxDC_DrawArc", _wrap_wxDC_DrawArc, METH_VARARGS },
+        { "wxDC_DeviceToLogicalYRel", _wrap_wxDC_DeviceToLogicalYRel, METH_VARARGS },
+        { "wxDC_DeviceToLogicalY", _wrap_wxDC_DeviceToLogicalY, METH_VARARGS },
+        { "wxDC_DeviceToLogicalXRel", _wrap_wxDC_DeviceToLogicalXRel, METH_VARARGS },
+        { "wxDC_DeviceToLogicalX", _wrap_wxDC_DeviceToLogicalX, METH_VARARGS },
+        { "wxDC_DestroyClippingRegion", _wrap_wxDC_DestroyClippingRegion, METH_VARARGS },
+        { "wxDC_CrossHair", _wrap_wxDC_CrossHair, METH_VARARGS },
+        { "wxDC_Clear", _wrap_wxDC_Clear, METH_VARARGS },
+        { "wxDC_Blit", _wrap_wxDC_Blit, METH_VARARGS },
+        { "wxDC_BeginDrawing", _wrap_wxDC_BeginDrawing, METH_VARARGS },
+        { "delete_wxDC", _wrap_delete_wxDC, METH_VARARGS },
+        { "wxBrush_SetStyle", _wrap_wxBrush_SetStyle, METH_VARARGS },
+        { "wxBrush_SetStipple", _wrap_wxBrush_SetStipple, METH_VARARGS },
+        { "wxBrush_SetColour", _wrap_wxBrush_SetColour, METH_VARARGS },
+        { "wxBrush_Ok", _wrap_wxBrush_Ok, METH_VARARGS },
+        { "wxBrush_GetStyle", _wrap_wxBrush_GetStyle, METH_VARARGS },
+        { "wxBrush_GetStipple", _wrap_wxBrush_GetStipple, METH_VARARGS },
+        { "wxBrush_GetColour", _wrap_wxBrush_GetColour, METH_VARARGS },
+        { "new_wxBrush", _wrap_new_wxBrush, METH_VARARGS },
+        { "wxPen_SetWidth", _wrap_wxPen_SetWidth, METH_VARARGS },
+        { "wxPen_SetStyle", _wrap_wxPen_SetStyle, METH_VARARGS },
+        { "wxPen_SetJoin", _wrap_wxPen_SetJoin, METH_VARARGS },
+        { "wxPen_SetColour", _wrap_wxPen_SetColour, METH_VARARGS },
+        { "wxPen_SetCap", _wrap_wxPen_SetCap, METH_VARARGS },
+        { "wxPen_Ok", _wrap_wxPen_Ok, METH_VARARGS },
+        { "wxPen_GetWidth", _wrap_wxPen_GetWidth, METH_VARARGS },
+        { "wxPen_GetStyle", _wrap_wxPen_GetStyle, METH_VARARGS },
+        { "wxPen_GetJoin", _wrap_wxPen_GetJoin, METH_VARARGS },
+        { "wxPen_GetColour", _wrap_wxPen_GetColour, METH_VARARGS },
+        { "wxPen_GetCap", _wrap_wxPen_GetCap, METH_VARARGS },
+        { "new_wxPen", _wrap_new_wxPen, METH_VARARGS },
+        { "wxColour_Get", _wrap_wxColour_Get, METH_VARARGS },
+        { "wxColour_Set", _wrap_wxColour_Set, METH_VARARGS },
+        { "wxColour_Ok", _wrap_wxColour_Ok, METH_VARARGS },
+        { "wxColour_Blue", _wrap_wxColour_Blue, METH_VARARGS },
+        { "wxColour_Green", _wrap_wxColour_Green, METH_VARARGS },
+        { "wxColour_Red", _wrap_wxColour_Red, METH_VARARGS },
+        { "delete_wxColour", _wrap_delete_wxColour, METH_VARARGS },
+        { "new_wxColour", _wrap_new_wxColour, METH_VARARGS },
+        { "wxFont_SetWeight", _wrap_wxFont_SetWeight, METH_VARARGS },
+        { "wxFont_SetUnderlined", _wrap_wxFont_SetUnderlined, METH_VARARGS },
+        { "wxFont_SetStyle", _wrap_wxFont_SetStyle, METH_VARARGS },
+        { "wxFont_SetPointSize", _wrap_wxFont_SetPointSize, METH_VARARGS },
+        { "wxFont_SetFamily", _wrap_wxFont_SetFamily, METH_VARARGS },
+        { "wxFont_SetFaceName", _wrap_wxFont_SetFaceName, METH_VARARGS },
+        { "wxFont_GetWeight", _wrap_wxFont_GetWeight, METH_VARARGS },
+        { "wxFont_GetUnderlined", _wrap_wxFont_GetUnderlined, METH_VARARGS },
+        { "wxFont_GetStyle", _wrap_wxFont_GetStyle, METH_VARARGS },
+        { "wxFont_GetPointSize", _wrap_wxFont_GetPointSize, METH_VARARGS },
+        { "wxFont_GetFamily", _wrap_wxFont_GetFamily, METH_VARARGS },
+        { "wxFont_GetFaceName", _wrap_wxFont_GetFaceName, METH_VARARGS },
+        { "new_wxFont", _wrap_new_wxFont, METH_VARARGS },
+        { "wxCursor_Ok", _wrap_wxCursor_Ok, METH_VARARGS },
+        { "delete_wxCursor", _wrap_delete_wxCursor, METH_VARARGS },
+        { "wxIcon_SetWidth", _wrap_wxIcon_SetWidth, METH_VARARGS },
+        { "wxIcon_SetHeight", _wrap_wxIcon_SetHeight, METH_VARARGS },
+        { "wxIcon_SetDepth", _wrap_wxIcon_SetDepth, METH_VARARGS },
+        { "wxIcon_Ok", _wrap_wxIcon_Ok, METH_VARARGS },
+        { "wxIcon_LoadFile", _wrap_wxIcon_LoadFile, METH_VARARGS },
+        { "wxIcon_GetWidth", _wrap_wxIcon_GetWidth, METH_VARARGS },
+        { "wxIcon_GetHeight", _wrap_wxIcon_GetHeight, METH_VARARGS },
+        { "wxIcon_GetDepth", _wrap_wxIcon_GetDepth, METH_VARARGS },
+        { "delete_wxIcon", _wrap_delete_wxIcon, METH_VARARGS },
+        { "new_wxIcon", _wrap_new_wxIcon, METH_VARARGS },
+        { "delete_wxMask", _wrap_delete_wxMask, METH_VARARGS },
+        { "new_wxMask", _wrap_new_wxMask, METH_VARARGS },
+        { "wxBitmap_SetWidth", _wrap_wxBitmap_SetWidth, METH_VARARGS },
+        { "wxBitmap_SetMask", _wrap_wxBitmap_SetMask, METH_VARARGS },
+        { "wxBitmap_SetHeight", _wrap_wxBitmap_SetHeight, METH_VARARGS },
+        { "wxBitmap_SetDepth", _wrap_wxBitmap_SetDepth, METH_VARARGS },
+        { "wxBitmap_SaveFile", _wrap_wxBitmap_SaveFile, METH_VARARGS },
+        { "wxBitmap_Ok", _wrap_wxBitmap_Ok, METH_VARARGS },
+        { "wxBitmap_LoadFile", _wrap_wxBitmap_LoadFile, METH_VARARGS },
+        { "wxBitmap_GetWidth", _wrap_wxBitmap_GetWidth, METH_VARARGS },
+        { "wxBitmap_GetMask", _wrap_wxBitmap_GetMask, METH_VARARGS },
+        { "wxBitmap_GetPalette", _wrap_wxBitmap_GetPalette, METH_VARARGS },
+        { "wxBitmap_GetHeight", _wrap_wxBitmap_GetHeight, METH_VARARGS },
+        { "wxBitmap_GetDepth", _wrap_wxBitmap_GetDepth, METH_VARARGS },
+        { "delete_wxBitmap", _wrap_delete_wxBitmap, METH_VARARGS },
+        { "new_wxBitmap", _wrap_new_wxBitmap, METH_VARARGS },
+        { "wxMemoryDCFromDC", _wrap_wxMemoryDCFromDC, METH_VARARGS },
+        { "wxNamedColour", _wrap_wxNamedColour, METH_VARARGS },
+        { "wxStockCursor", _wrap_wxStockCursor, METH_VARARGS },
+        { "wxMaskColour", _wrap_wxMaskColour, METH_VARARGS },
+        { "wxNoRefBitmap", _wrap_wxNoRefBitmap, METH_VARARGS },
+        { "wxEmptyBitmap", _wrap_wxEmptyBitmap, 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},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_byte","_unsigned_char",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_wxDC","_class_wxPostScriptDC",SwigwxPostScriptDCTowxDC},
+    { "_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC},
+    { "_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC},
+    { "_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC},
+    { "_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC},
+    { "_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC},
+    { "_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC},
+    { "_wxDC","_wxClientDC",SwigwxClientDCTowxDC},
+    { "_wxDC","_class_wxScreenDC",SwigwxScreenDCTowxDC},
+    { "_wxDC","_wxScreenDC",SwigwxScreenDCTowxDC},
+    { "_wxDC","_class_wxMemoryDC",SwigwxMemoryDCTowxDC},
+    { "_wxDC","_wxMemoryDC",SwigwxMemoryDCTowxDC},
+    { "_wxDC","_class_wxDC",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_class_wxPostScriptDC","_wxPostScriptDC",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap},
+    { "_wxBitmap","_wxCursor",SwigwxCursorTowxBitmap},
+    { "_wxBitmap","_class_wxIcon",SwigwxIconTowxBitmap},
+    { "_wxBitmap","_wxIcon",SwigwxIconTowxBitmap},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_class_wxPostScriptDC",SwigwxPostScriptDCTowxDC},
+    { "_class_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC},
+    { "_class_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC},
+    { "_class_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC},
+    { "_class_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC},
+    { "_class_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC},
+    { "_class_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC},
+    { "_class_wxDC","_wxClientDC",SwigwxClientDCTowxDC},
+    { "_class_wxDC","_class_wxScreenDC",SwigwxScreenDCTowxDC},
+    { "_class_wxDC","_wxScreenDC",SwigwxScreenDCTowxDC},
+    { "_class_wxDC","_class_wxMemoryDC",SwigwxMemoryDCTowxDC},
+    { "_class_wxDC","_wxMemoryDC",SwigwxMemoryDCTowxDC},
+    { "_class_wxDC","_wxDC",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},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxPostScriptDC","_class_wxPostScriptDC",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},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap},
+    { "_class_wxBitmap","_wxCursor",SwigwxCursorTowxBitmap},
+    { "_class_wxBitmap","_class_wxIcon",SwigwxIconTowxBitmap},
+    { "_class_wxBitmap","_wxIcon",SwigwxIconTowxBitmap},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxPalette","_wxPalette",0},
+{0,0,0}};
+
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
-SWIGEXPORT(void,initgdic)() {
+SWIGEXPORT(void) initgdic() {
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("gdic", gdicMethods);
@@ -5985,140 +6599,9 @@ SWIGEXPORT(void,initgdic)() {
         PyDict_SetItemString(d,"wxIMAGE_LIST_NORMAL", PyInt_FromLong((long) wxIMAGE_LIST_NORMAL));
         PyDict_SetItemString(d,"wxIMAGE_LIST_SMALL", PyInt_FromLong((long) wxIMAGE_LIST_SMALL));
         PyDict_SetItemString(d,"wxIMAGE_LIST_STATE", PyInt_FromLong((long) wxIMAGE_LIST_STATE));
-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-        SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_signed_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-        SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);
-        SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-        SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-        SWIG_RegisterMapping("_byte","_unsigned_char",0);
-        SWIG_RegisterMapping("_long","_wxDash",0);
-        SWIG_RegisterMapping("_long","_unsigned_long",0);
-        SWIG_RegisterMapping("_long","_signed_long",0);
-        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-        SWIG_RegisterMapping("_wxDC","_class_wxPostScriptDC",SwigwxPostScriptDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxClientDC",SwigwxClientDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_class_wxScreenDC",SwigwxScreenDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxScreenDC",SwigwxScreenDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_class_wxMemoryDC",SwigwxMemoryDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxMemoryDC",SwigwxMemoryDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-        SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-        SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);
-        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);
-        SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-        SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-        SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-        SWIG_RegisterMapping("_uint","_unsigned_int",0);
-        SWIG_RegisterMapping("_uint","_int",0);
-        SWIG_RegisterMapping("_uint","_wxWindowID",0);
-        SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-        SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap);
-        SWIG_RegisterMapping("_wxBitmap","_wxCursor",SwigwxCursorTowxBitmap);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxIcon",SwigwxIconTowxBitmap);
-        SWIG_RegisterMapping("_wxBitmap","_wxIcon",SwigwxIconTowxBitmap);
-        SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-        SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-        SWIG_RegisterMapping("_EBool","_signed_int",0);
-        SWIG_RegisterMapping("_EBool","_int",0);
-        SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-        SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-        SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-        SWIG_RegisterMapping("_unsigned_long","_long",0);
-        SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-        SWIG_RegisterMapping("_class_wxDC","_class_wxPostScriptDC",SwigwxPostScriptDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxClientDC",SwigwxClientDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_class_wxScreenDC",SwigwxScreenDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxScreenDC",SwigwxScreenDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_class_wxMemoryDC",SwigwxMemoryDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxMemoryDC",SwigwxMemoryDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-        SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-        SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",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("_wxScreenDC","_class_wxScreenDC",0);
-        SWIG_RegisterMapping("_WXTYPE","_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-        SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-        SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-        SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_unsigned_short","_short",0);
-        SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-        SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-        SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-        SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_signed_short","_short",0);
-        SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-        SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-        SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-        SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0);
-        SWIG_RegisterMapping("_unsigned_char","_byte",0);
-        SWIG_RegisterMapping("_unsigned_int","_uint",0);
-        SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_unsigned_int","_int",0);
-        SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-        SWIG_RegisterMapping("_short","_WXTYPE",0);
-        SWIG_RegisterMapping("_short","_unsigned_short",0);
-        SWIG_RegisterMapping("_short","_signed_short",0);
-        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-        SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-        SWIG_RegisterMapping("_wxWindowID","_uint",0);
-        SWIG_RegisterMapping("_wxWindowID","_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-        SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_EBool",0);
-        SWIG_RegisterMapping("_int","_uint",0);
-        SWIG_RegisterMapping("_int","_wxWindowID",0);
-        SWIG_RegisterMapping("_int","_unsigned_int",0);
-        SWIG_RegisterMapping("_int","_signed_int",0);
-        SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-        SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-        SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-        SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-        SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-        SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-        SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-        SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-        SWIG_RegisterMapping("_class_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxCursor",SwigwxCursorTowxBitmap);
-        SWIG_RegisterMapping("_class_wxBitmap","_class_wxIcon",SwigwxIconTowxBitmap);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxIcon",SwigwxIconTowxBitmap);
-        SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-        SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-        SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-        SWIG_RegisterMapping("_wxDash","_long",0);
-        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}
 }