Fixes so bg colors in a notebook on XP are visible again

[wxWidgets.git] / wxPython / src / gtk / gdi_wrap.cpp

diff --git a/wxPython/src/gtk/gdi_wrap.cpp b/wxPython/src/gtk/gdi_wrap.cpp
index 80356fe1a41de897e3e89510f899b7140124b0ca..8e46b5aa23c68fcecc4ca758f7d4bf180ea3b302 100644 (file)
--- a/wxPython/src/gtk/gdi_wrap.cpp
+++ b/wxPython/src/gtk/gdi_wrap.cpp
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).

- * Version 1.3.20
+ * Version 1.3.22

  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make


@@ -45,6 +45,8 @@ private:
 #define SWIG_TypeName        SWIG_Python_TypeName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_TypeName        SWIG_Python_TypeName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData

+#define SWIG_PackData        SWIG_Python_PackData 
+#define SWIG_UnpackData      SWIG_Python_UnpackData 

 
 
 /***********************************************************************
 
 
 /***********************************************************************


@@ -59,36 +61,35 @@ private:
 
 #include <string.h>
 
 
 #include <string.h>
 

-#if defined(_WIN32) || defined(__WIN32__)
-#       if defined(_MSC_VER)
-#               if defined(STATIC_LINKED)
-#                       define SWIGEXPORT(a) a
-#                       define SWIGIMPORT(a) extern a
-#               else
-#                       define SWIGEXPORT(a) __declspec(dllexport) a
-#                       define SWIGIMPORT(a) extern a
-#               endif
-#       else
-#               if defined(__BORLANDC__)
-#                       define SWIGEXPORT(a) a _export
-#                       define SWIGIMPORT(a) a _export
-#               else
-#                       define SWIGEXPORT(a) a
-#                       define SWIGIMPORT(a) a
-#               endif
-#       endif
+#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#  if defined(_MSC_VER) || defined(__GNUC__)
+#    if defined(STATIC_LINKED)
+#      define SWIGEXPORT(a) a
+#      define SWIGIMPORT(a) extern a
+#    else
+#      define SWIGEXPORT(a) __declspec(dllexport) a
+#      define SWIGIMPORT(a) extern a
+#    endif
+#  else
+#    if defined(__BORLANDC__)
+#      define SWIGEXPORT(a) a _export
+#      define SWIGIMPORT(a) a _export
+#    else
+#      define SWIGEXPORT(a) a
+#      define SWIGIMPORT(a) a
+#    endif
+#  endif

 #else
 #else

-#       define SWIGEXPORT(a) a
-#       define SWIGIMPORT(a) a
+#  define SWIGEXPORT(a) a
+#  define SWIGIMPORT(a) a

 #endif
 
 #ifdef SWIG_GLOBAL
 #endif
 
 #ifdef SWIG_GLOBAL

-#define SWIGRUNTIME(a) SWIGEXPORT(a)
+#  define SWIGRUNTIME(a) SWIGEXPORT(a)

 #else
 #else

-#define SWIGRUNTIME(a) static a
+#  define SWIGRUNTIME(a) static a

 #endif
 
 #endif
 

-

 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif


@@ -114,6 +115,8 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *);
 SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *);
 SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);

+SWIGIMPORT(char *)           SWIG_PackData(char *, void *, int);
+SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);

 
 
 #ifdef __cplusplus
 
 
 #ifdef __cplusplus


@@ -130,7 +133,6 @@ SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);
  *
  ************************************************************************/
 
  *
  ************************************************************************/
 

-

 #include "Python.h"
 
 #ifdef __cplusplus
 #include "Python.h"
 
 #ifdef __cplusplus


@@ -161,8 +163,6 @@ typedef struct swig_const_info {
     swig_type_info **ptype;
 } swig_const_info;
 
     swig_type_info **ptype;
 } swig_const_info;
 

-
-

 /* Common SWIG API */
 #define SWIG_ConvertPtr(obj, pp, type, flags) \
   SWIG_Python_ConvertPtr(obj, pp, type, flags)
 /* Common SWIG API */
 #define SWIG_ConvertPtr(obj, pp, type, flags) \
   SWIG_Python_ConvertPtr(obj, pp, type, flags)


@@ -170,7 +170,7 @@ typedef struct swig_const_info {
   SWIG_Python_NewPointerObj(p, type, flags)
 #define SWIG_MustGetPtr(p, type, argnum, flags) \
   SWIG_Python_MustGetPtr(p, type, argnum, flags)
   SWIG_Python_NewPointerObj(p, type, flags)
 #define SWIG_MustGetPtr(p, type, argnum, flags) \
   SWIG_Python_MustGetPtr(p, type, argnum, flags)

-
+ 

 /* Python-specific SWIG API */
 #define SWIG_newvarlink() \
   SWIG_Python_newvarlink()
 /* Python-specific SWIG API */
 #define SWIG_newvarlink() \
   SWIG_Python_newvarlink()


@@ -178,110 +178,91 @@ typedef struct swig_const_info {
   SWIG_Python_addvarlink(p, name, get_attr, set_attr)
 #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \
   SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags)
   SWIG_Python_addvarlink(p, name, get_attr, set_attr)
 #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \
   SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags)

-#define SWIG_PackData(c, ptr, sz) \
-  SWIG_Python_PackData(c, ptr, sz)
-#define SWIG_UnpackData(c, ptr, sz) \
-  SWIG_Python_UnpackData(c, ptr, sz)

 #define SWIG_NewPackedObj(ptr, sz, type) \
   SWIG_Python_NewPackedObj(ptr, sz, type)
 #define SWIG_InstallConstants(d, constants) \
   SWIG_Python_InstallConstants(d, constants)
 
 #define SWIG_NewPackedObj(ptr, sz, type) \
   SWIG_Python_NewPackedObj(ptr, sz, type)
 #define SWIG_InstallConstants(d, constants) \
   SWIG_Python_InstallConstants(d, constants)
 

+typedef double (*py_objasdbl_conv)(PyObject *obj);

 
 

-SWIGEXPORT(int)               SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int);
-SWIGEXPORT(PyObject *)        SWIG_Python_NewPointerObj(void *, swig_type_info *,int own);
-SWIGEXPORT(void *)           SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int);
-
-SWIGEXPORT(PyObject *)        SWIG_Python_newvarlink(void);
-SWIGEXPORT(void)              SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
-SWIGEXPORT(int)               SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int);
-SWIGEXPORT(char *)            SWIG_Python_PackData(char *c, void *, int);
-SWIGEXPORT(char *)            SWIG_Python_UnpackData(char *c, void *, int);
-SWIGEXPORT(PyObject *)        SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *);
-SWIGEXPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);
+SWIGIMPORT(int)               SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int);
+SWIGIMPORT(PyObject *)        SWIG_Python_NewPointerObj(void *, swig_type_info *,int own);
+SWIGIMPORT(void *)            SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int);
+SWIGIMPORT(PyObject *)        SWIG_Python_newvarlink(void);
+SWIGIMPORT(void)              SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
+SWIGIMPORT(int)               SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int);
+SWIGIMPORT(PyObject *)        SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *);
+SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);

 
 
 /* Contract support */
 
 
 
 /* Contract support */
 

-#define SWIG_preassert(expr, msg)  if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
-#define SWIG_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
-
-#define SWIG_inherit_preassert(expr, msg)  if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
-#define SWIG_inherit_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
-
-#define SWIG_invariant(expr, msg)       if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
-#define SWIG_invariant_begin(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
-#define SWIG_invariant_end(expr, msg)   if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
+#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else

 
 #ifdef __cplusplus
 }
 #endif
 
 
 
 #ifdef __cplusplus
 }
 #endif
 
 

-

 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxPostScriptDC swig_types[0] 
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxPostScriptDC swig_types[0] 

-#define  SWIGTYPE_p_wxGenericDragImage swig_types[1] 
-#define  SWIGTYPE_p_wxBrush swig_types[2] 
-#define  SWIGTYPE_p_wxColour swig_types[3] 
-#define  SWIGTYPE_p_wxCoord swig_types[4] 
-#define  SWIGTYPE_p_wxDC swig_types[5] 
-#define  SWIGTYPE_p_wxMirrorDC swig_types[6] 
-#define  SWIGTYPE_p_byte swig_types[7] 
-#define  SWIGTYPE_p_wxPyFontEnumerator swig_types[8] 
-#define  SWIGTYPE_p_wxIconLocation swig_types[9] 
-#define  SWIGTYPE_p_wxImage swig_types[10] 
-#define  SWIGTYPE_p_wxMetaFileDC swig_types[11] 
-#define  SWIGTYPE_p_wxMask swig_types[12] 
-#define  SWIGTYPE_p_wxFont swig_types[13] 
-#define  SWIGTYPE_p_wxWindow swig_types[14] 
-#define  SWIGTYPE_p_wxSize swig_types[15] 
-#define  SWIGTYPE_p_double swig_types[16] 
-#define  SWIGTYPE_p_wxMemoryDC swig_types[17] 
-#define  SWIGTYPE_p_wxFontMapper swig_types[18] 
-#define  SWIGTYPE_p_wxListCtrl swig_types[19] 
-#define  SWIGTYPE_p_wxEffects swig_types[20] 
-#define  SWIGTYPE_p_wxNativeEncodingInfo swig_types[21] 
-#define  SWIGTYPE_p_wxPalette swig_types[22] 
-#define  SWIGTYPE_p_wxBitmap swig_types[23] 
-#define  SWIGTYPE_p_wxObject swig_types[24] 
-#define  SWIGTYPE_p_wxRegionIterator swig_types[25] 
-#define  SWIGTYPE_p_wxRect swig_types[26] 
-#define  SWIGTYPE_p_wxString swig_types[27] 
-#define  SWIGTYPE_p_wxPrinterDC swig_types[28] 
-#define  SWIGTYPE_p_wxIconBundle swig_types[29] 
-#define  SWIGTYPE_p_wxPoint swig_types[30] 
-#define  SWIGTYPE_p_wxDash swig_types[31] 
-#define  SWIGTYPE_p_wxScreenDC swig_types[32] 
-#define  SWIGTYPE_p_wxCursor swig_types[33] 
-#define  SWIGTYPE_p_wxClientDC swig_types[34] 
-#define  SWIGTYPE_p_wxTreeCtrl swig_types[35] 
-#define  SWIGTYPE_p_wxBufferedDC swig_types[36] 
-#define  SWIGTYPE_p_wxImageList swig_types[37] 
-#define  SWIGTYPE_p_unsigned_char swig_types[38] 
-#define  SWIGTYPE_p_wxGDIObject swig_types[39] 
-#define  SWIGTYPE_p_wxLocale swig_types[40] 
-#define  SWIGTYPE_p_wxIcon swig_types[41] 
-#define  SWIGTYPE_p_wxRegion swig_types[42] 
-#define  SWIGTYPE_p_wxLanguageInfo swig_types[43] 
-#define  SWIGTYPE_p_wxConfigBase swig_types[44] 
-#define  SWIGTYPE_p_wxWindowDC swig_types[45] 
-#define  SWIGTYPE_p_wxPrintData swig_types[46] 
-#define  SWIGTYPE_p_wxBrushList swig_types[47] 
-#define  SWIGTYPE_p_wxFontList swig_types[48] 
-#define  SWIGTYPE_p_wxPen swig_types[49] 
-#define  SWIGTYPE_p_wxBufferedPaintDC swig_types[50] 
-#define  SWIGTYPE_p_wxPaintDC swig_types[51] 
-#define  SWIGTYPE_p_wxPenList swig_types[52] 
-#define  SWIGTYPE_p_wxTreeItemId swig_types[53] 
-#define  SWIGTYPE_p_wxPyPen swig_types[54] 
-#define  SWIGTYPE_p_int swig_types[55] 
-#define  SWIGTYPE_p_wxMetaFile swig_types[56] 
-#define  SWIGTYPE_p_wxNativeFontInfo swig_types[57] 
-#define  SWIGTYPE_p_wxEncodingConverter swig_types[58] 
-#define  SWIGTYPE_p_wxColourDatabase swig_types[59] 
-static swig_type_info *swig_types[61];
+#define  SWIGTYPE_p_wxBrush swig_types[1] 
+#define  SWIGTYPE_p_wxColour swig_types[2] 
+#define  SWIGTYPE_p_wxDC swig_types[3] 
+#define  SWIGTYPE_p_wxMirrorDC swig_types[4] 
+#define  SWIGTYPE_p_byte swig_types[5] 
+#define  SWIGTYPE_p_wxPyFontEnumerator swig_types[6] 
+#define  SWIGTYPE_p_char swig_types[7] 
+#define  SWIGTYPE_p_wxIconLocation swig_types[8] 
+#define  SWIGTYPE_p_wxImage swig_types[9] 
+#define  SWIGTYPE_p_wxMetaFileDC swig_types[10] 
+#define  SWIGTYPE_p_wxMask swig_types[11] 
+#define  SWIGTYPE_p_wxFont swig_types[12] 
+#define  SWIGTYPE_p_wxWindow swig_types[13] 
+#define  SWIGTYPE_p_wxSize swig_types[14] 
+#define  SWIGTYPE_p_double swig_types[15] 
+#define  SWIGTYPE_p_wxMemoryDC swig_types[16] 
+#define  SWIGTYPE_p_wxFontMapper swig_types[17] 
+#define  SWIGTYPE_p_wxEffects swig_types[18] 
+#define  SWIGTYPE_p_wxNativeEncodingInfo swig_types[19] 
+#define  SWIGTYPE_p_wxPalette swig_types[20] 
+#define  SWIGTYPE_p_wxBitmap swig_types[21] 
+#define  SWIGTYPE_p_wxObject swig_types[22] 
+#define  SWIGTYPE_p_wxRegionIterator swig_types[23] 
+#define  SWIGTYPE_p_wxRect swig_types[24] 
+#define  SWIGTYPE_p_wxString swig_types[25] 
+#define  SWIGTYPE_p_wxPrinterDC swig_types[26] 
+#define  SWIGTYPE_p_wxIconBundle swig_types[27] 
+#define  SWIGTYPE_p_wxPoint swig_types[28] 
+#define  SWIGTYPE_p_wxDash swig_types[29] 
+#define  SWIGTYPE_p_wxScreenDC swig_types[30] 
+#define  SWIGTYPE_p_wxCursor swig_types[31] 
+#define  SWIGTYPE_p_wxClientDC swig_types[32] 
+#define  SWIGTYPE_p_wxBufferedDC swig_types[33] 
+#define  SWIGTYPE_p_wxImageList swig_types[34] 
+#define  SWIGTYPE_p_unsigned_char swig_types[35] 
+#define  SWIGTYPE_p_wxGDIObject swig_types[36] 
+#define  SWIGTYPE_p_wxIcon swig_types[37] 
+#define  SWIGTYPE_p_wxLocale swig_types[38] 
+#define  SWIGTYPE_p_wxRegion swig_types[39] 
+#define  SWIGTYPE_p_wxLanguageInfo swig_types[40] 
+#define  SWIGTYPE_p_wxConfigBase swig_types[41] 
+#define  SWIGTYPE_p_wxWindowDC swig_types[42] 
+#define  SWIGTYPE_p_wxPrintData swig_types[43] 
+#define  SWIGTYPE_p_wxBrushList swig_types[44] 
+#define  SWIGTYPE_p_wxFontList swig_types[45] 
+#define  SWIGTYPE_p_wxPen swig_types[46] 
+#define  SWIGTYPE_p_wxBufferedPaintDC swig_types[47] 
+#define  SWIGTYPE_p_wxPaintDC swig_types[48] 
+#define  SWIGTYPE_p_wxPenList swig_types[49] 
+#define  SWIGTYPE_p_wxPyPen swig_types[50] 
+#define  SWIGTYPE_p_int swig_types[51] 
+#define  SWIGTYPE_p_wxMetaFile swig_types[52] 
+#define  SWIGTYPE_p_wxNativeFontInfo swig_types[53] 
+#define  SWIGTYPE_p_wxEncodingConverter swig_types[54] 
+#define  SWIGTYPE_p_wxColourDatabase swig_types[55] 
+static swig_type_info *swig_types[57];

 
 /* -------- TYPES TABLE (END) -------- */
 
 
 /* -------- TYPES TABLE (END) -------- */
 


@@ -293,10 +274,158 @@ static swig_type_info *swig_types[61];
 
 #define SWIG_name    "_gdi"
 
 
 #define SWIG_name    "_gdi"
 

+/* Auxiliar swig  macros */
+
+#ifdef __cplusplus
+#define SWIGSTATICINLINE(a) static inline a
+#define SWIGSTATIC(a) static a
+#define swig_new_array(type, size) (new type[(size)])
+#define swig_delete_array(cptr) delete[] cptr
+#define swig_const_cast(type,a) const_cast<type>(a)
+#define swig_static_cast(type,a) static_cast<type>(a)
+#define swig_reinterpret_cast(type,a) reinterpret_cast<type>(a)
+
+#ifdef HAVE_NUMERIC_CAST
+#define swig_numeric_cast(type,a) numeric_cast<type>(a)
+#else
+#define swig_numeric_cast(type,a) static_cast<type>(a)
+#endif
+
+#else /* C case */
+
+#define SWIGSTATICINLINE(a) static a
+#define SWIGSTATIC(a) static a
+#define swig_new_array(type, size) ((type*) malloc((size)*sizeof(type)))
+#define swig_delete_array(cptr) free((char*)cptr)
+#define swig_const_cast(type,a) (type)(a)
+#define swig_static_cast(type,a) (type)(a)
+#define swig_reinterpret_cast(type,a) (type)(a)
+#define swig_numeric_cast(type,a) (type)(a)
+
+#endif /* __cplusplus */
+
+
+#define SWIG_FromSignedChar     PyInt_FromLong
+#define SWIG_FromUnsignedChar   PyInt_FromLong
+#define SWIG_FromShort         PyInt_FromLong
+#define SWIG_FromUnsignedShort  PyInt_FromLong
+#define SWIG_FromInt           PyInt_FromLong
+#define SWIG_FromLong          PyInt_FromLong
+#define SWIG_FromFloat         PyFloat_FromDouble
+#define SWIG_FromDouble        PyFloat_FromDouble
+#define SWIG_FromFloat         PyFloat_FromDouble
+#define SWIG_FromDouble        PyFloat_FromDouble
+
+

 #include "wx/wxPython/wxPython.h"
 #include "wx/wxPython/pyclasses.h"
     
 #include "wx/wxPython/wxPython.h"
 #include "wx/wxPython/pyclasses.h"
     

-    DECLARE_DEF_STRING(EmptyString);
+
+ static const wxString wxPyEmptyString(wxEmptyString); 
+
+SWIGSTATICINLINE(bool)
+SWIG_AsBool(PyObject *obj)
+{
+  return PyObject_IsTrue(obj) ? true : false;
+}
+
+
+SWIGSTATICINLINE(int)
+SWIG_CheckBool(PyObject* obj)
+{
+  SWIG_AsBool(obj);
+  if (PyErr_Occurred()) {
+    PyErr_Clear();
+    return 0;
+  } else {
+    return 1;
+  }
+}
+
+
+#include <limits.h>
+
+
+SWIGSTATICINLINE(unsigned long)
+SWIG_CheckUnsignedLongInRange(unsigned long value, const char* type,
+                             unsigned long max_value) 
+{
+  if (!PyErr_Occurred()) {
+    if (value > max_value) {     
+      PyObject *err =
+       PyString_FromFormat("value %ld is greater than '%s' minimum %ld",
+                           value, type, max_value);
+      PyErr_SetObject(PyExc_OverflowError, err);
+      Py_DECREF(err);
+    }
+  }
+  return value;
+}
+
+
+SWIGSTATICINLINE(long)
+SWIG_AsLong(PyObject * obj)
+{
+    if (PyNumber_Check(obj))
+        return PyInt_AsLong(obj);
+    else {
+        PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
+                                               obj->ob_type->tp_name);
+        PyErr_SetObject(PyExc_TypeError, errmsg);
+        Py_DECREF(errmsg);
+        return 0;
+    }
+}
+
+
+SWIGSTATICINLINE(unsigned long)
+SWIG_AsUnsignedLong(PyObject * obj) 
+{
+  if (PyLong_Check(obj)) {
+    return PyLong_AsUnsignedLong(obj);
+  } else {
+    long i = SWIG_AsLong(obj);
+    if ( !PyErr_Occurred() && (i < 0)) {
+      PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
+    }
+    return i;
+  }
+}
+
+
+SWIGSTATICINLINE(unsigned char)
+SWIG_AsUnsignedChar(PyObject *obj)
+{ 
+  return swig_numeric_cast(unsigned char,
+    SWIG_CheckUnsignedLongInRange(SWIG_AsUnsignedLong(obj),
+                                 "unsigned char", UCHAR_MAX));
+}
+
+
+SWIGSTATICINLINE(int)
+SWIG_CheckUnsignedChar(PyObject* obj)
+{
+  SWIG_AsUnsignedChar(obj);
+  if (PyErr_Occurred()) {
+    PyErr_Clear();
+    return 0;
+  } else {
+    return 1;
+  }
+}
+
+
+SWIGSTATICINLINE(int)
+SWIG_CheckUnsignedLong(PyObject* obj)
+{
+  SWIG_AsUnsignedLong(obj);
+  if (PyErr_Occurred()) {
+    PyErr_Clear();
+    return 0;
+  } else {
+    return 1;
+  }
+}

 
 PyObject *wxColour_Get(wxColour *self){
             PyObject* rv = PyTuple_New(3);
 
 PyObject *wxColour_Get(wxColour *self){
             PyObject* rv = PyTuple_New(3);


@@ -313,6 +442,68 @@ PyObject *wxColour_Get(wxColour *self){
             PyTuple_SetItem(rv, 2, PyInt_FromLong(blue));
             return rv;
         }
             PyTuple_SetItem(rv, 2, PyInt_FromLong(blue));
             return rv;
         }

+unsigned long wxColour_GetRGB(wxColour *self){
+            return self->Red() | (self->Green() << 8) | (self->Blue() << 16);
+        }
+
+SWIGSTATICINLINE(PyObject* )
+SWIG_FromUnsignedLong(unsigned long value)
+{
+  return (value > LONG_MAX) ?
+    PyLong_FromUnsignedLong(value) 
+    : PyInt_FromLong(swig_numeric_cast(long,value)); 
+}
+
+
+SWIGSTATICINLINE(long)
+SWIG_CheckLongInRange(long value, const char* type,
+                     long min_value, long max_value)
+{
+  if (!PyErr_Occurred()) {
+    if (value < min_value) {
+      PyObject *err = 
+       PyString_FromFormat("value %ld is less than '%s' minimum %ld", 
+                           value, type, min_value);
+      
+      PyErr_SetObject(PyExc_OverflowError, err);
+      Py_DECREF(err);
+    } else if (value > max_value) {
+      PyObject *err = 
+       PyString_FromFormat("value %ld is greater than '%s' maximum %ld", 
+                           value, type, max_value);
+      PyErr_SetObject(PyExc_OverflowError, err);
+      Py_DECREF(err);
+    }
+  }
+  return value;
+}
+
+
+#if INT_MAX != LONG_MAX
+SWIGSTATICINLINE(int)
+SWIG_AsInt(PyObject *obj)
+{ 
+  return swig_numeric_cast(int,
+    SWIG_CheckLongInRange(SWIG_AsLong(obj),
+                         "int", INT_MIN, INT_MAX));
+}
+#else
+#define SWIG_AsInt SWIG_AsLong
+#endif
+
+
+SWIGSTATICINLINE(int)
+SWIG_CheckInt(PyObject* obj)
+{
+  SWIG_AsInt(obj);
+  if (PyErr_Occurred()) {
+    PyErr_Clear();
+    return 0;
+  } else {
+    return 1;
+  }
+}
+

 
 static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;


@@ -343,13 +534,15 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 PyObject *wxPen_GetDashes(wxPen *self){
             wxDash* dashes;
             int count = self->GetDashes(&dashes);
 PyObject *wxPen_GetDashes(wxPen *self){
             wxDash* dashes;
             int count = self->GetDashes(&dashes);

-            wxPyBeginBlockThreads();
+            bool blocked = wxPyBeginBlockThreads();

             PyObject* retval = PyList_New(0);
             for (int x=0; x<count; x++)
                 PyList_Append(retval, PyInt_FromLong(dashes[x]));
             PyObject* retval = PyList_New(0);
             for (int x=0; x<count; x++)
                 PyList_Append(retval, PyInt_FromLong(dashes[x]));

-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);

             return retval;
         }
             return retval;
         }

+bool wxPen___eq__(wxPen *self,wxPen const *other){ return other ? (*self == *other) : False; }
+bool wxPen___ne__(wxPen *self,wxPen const *other){ return other ? (*self != *other) : True;  }

 
 wxPyPen::~wxPyPen()
 {
 
 wxPyPen::~wxPyPen()
 {


@@ -411,6 +604,14 @@ void wxBitmap_SetMaskColour(wxBitmap *self,wxColour const &colour){
             wxMask *mask = new wxMask(*self, colour);
             self->SetMask(mask);
         }
             wxMask *mask = new wxMask(*self, colour);
             self->SetMask(mask);
         }

+bool wxBitmap___eq__(wxBitmap *self,wxBitmap const *other){ return other ? (*self == *other) : False; }
+bool wxBitmap___ne__(wxBitmap *self,wxBitmap const *other){ return other ? (*self != *other) : True;  }
+wxMask *new_wxMask(wxBitmap const &bitmap,wxColour const &colour){
+            if ( !colour.Ok() )
+                return new wxMask(bitmap, *wxBLACK);
+            else
+                return new wxMask(bitmap, colour);
+        }

 
 #include <wx/iconbndl.h>
 
 
 #include <wx/iconbndl.h>
 


@@ -451,22 +652,26 @@ int wxIconLocation_GetIndex(wxIconLocation *self){
             return -1;
 
         }
             return -1;
 
         }

-wxCursor *new_wxCursor(wxString const *cursorName,long flags,int hotSpotX,int hotSpotY){
-
-            wxCHECK_MSG(FALSE, NULL,
-                        wxT("wxCursor constructor not implemented for wxGTK, use wxStockCursor, wxCursorFromImage, or wxCursorFromBits instead."));
-

 
 

+SWIGSTATICINLINE(int)
+SWIG_CheckLong(PyObject* obj)
+{
+  SWIG_AsLong(obj);
+  if (PyErr_Occurred()) {
+    PyErr_Clear();
+    return 0;
+  } else {
+    return 1;
+  }
+}

 
 

-        }
-wxCursor *new_wxCursor(PyObject *bits,int width,int height,int hotSpotX,int hotSpotY,PyObject *maskBits){
-            char* bitsbuf;
-            char* maskbuf = NULL;
-            int   length;
-            PyString_AsStringAndSize(bits, &bitsbuf, &length);
-            if (maskBits)
-                PyString_AsStringAndSize(maskBits, &maskbuf, &length);
-            return new wxCursor(bitsbuf, width, height, hotSpotX, hotSpotY, maskbuf);
+wxCursor *new_wxCursor(wxString const *cursorName,long type,int hotSpotX,int hotSpotY){
+#ifdef __WXGTK__
+            wxCHECK_MSG(False, NULL,
+                        wxT("wx.Cursor constructor not implemented for wxGTK, use wx.StockCursor, wx.CursorFromImage, or wx.CursorFromBits instead."));
+#else
+            return new wxCursor(*cursorName, type, hotSpotX, hotSpotY);
+#endif

         }
 
 
         }
 
 


@@ -510,6 +715,8 @@ wxFont *new_wxFont(wxString const &info){
 wxFont *new_wxFont(int pointSize,wxFontFamily family,int flags,wxString const &face,wxFontEncoding encoding){
             return wxFont::New(pointSize, family, flags, face, encoding);
         }
 wxFont *new_wxFont(int pointSize,wxFontFamily family,int flags,wxString const &face,wxFontEncoding encoding){
             return wxFont::New(pointSize, family, flags, face, encoding);
         }

+bool wxFont___eq__(wxFont *self,wxFont const *other){ return other ? (*self == *other) : False; }
+bool wxFont___ne__(wxFont *self,wxFont const *other){ return other ? (*self != *other) : True;  }

 
 class wxPyFontEnumerator : public wxFontEnumerator {
 public:
 
 class wxPyFontEnumerator : public wxFontEnumerator {
 public:


@@ -539,7 +746,7 @@ PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){
 
 #include "wx/wxPython/pydrawxxx.h"
 
 
 #include "wx/wxPython/pydrawxxx.h"
 

-wxColour wxDC_GetPixelXY(wxDC *self,wxCoord x,wxCoord y){
+wxColour wxDC_GetPixelXY(wxDC *self,int x,int y){

             wxColour col;
             self->GetPixel(x, y, &col);
             return col;
             wxColour col;
             self->GetPixel(x, y, &col);
             return col;


@@ -549,6 +756,34 @@ wxColour wxDC_GetPixel(wxDC *self,wxPoint const &pt){
             self->GetPixel(pt, &col);
             return col;
         }
             self->GetPixel(pt, &col);
             return col;
         }

+
+SWIGSTATICINLINE(double)
+SWIG_AsDouble(PyObject *obj)
+{
+    if (PyNumber_Check(obj))
+        return PyFloat_AsDouble(obj);
+    else {
+        PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
+                                               obj->ob_type->tp_name);
+        PyErr_SetObject(PyExc_TypeError, errmsg);
+        Py_DECREF(errmsg);
+        return 0;
+    }
+}
+
+
+SWIGSTATICINLINE(int)
+SWIG_CheckDouble(PyObject* obj)
+{
+  SWIG_AsDouble(obj);
+  if (PyErr_Occurred()) {
+    PyErr_Clear();
+    return 0;
+  } else {
+    return 1;
+  }
+}
+

 wxRect wxDC_DrawImageLabel(wxDC *self,wxString const &text,wxBitmap const &image,wxRect const &rect,int alignment,int indexAccel){
             wxRect rv;
             self->DrawLabel(text, image, rect, alignment, indexAccel, &rv);
 wxRect wxDC_DrawImageLabel(wxDC *self,wxString const &text,wxBitmap const &image,wxRect const &rect,int alignment,int indexAccel){
             wxRect rv;
             self->DrawLabel(text, image, rect, alignment, indexAccel, &rv);


@@ -559,6 +794,11 @@ wxRect wxDC_GetClippingRect(wxDC *self){
             self->GetClippingBox(rect);
             return rect;
         }
             self->GetClippingBox(rect);
             return rect;
         }

+wxArrayInt wxDC_GetPartialTextExtents(wxDC *self,wxString const &text){
+            wxArrayInt widths;
+            self->GetPartialTextExtents(text, widths);
+            return widths;
+        }

 PyObject *wxDC__DrawPointList(wxDC *self,PyObject *pyCoords,PyObject *pyPens,PyObject *pyBrushes){
             return wxPyDrawXXXList(*self, wxPyDrawXXXPoint, pyCoords, pyPens, pyBrushes);
         }
 PyObject *wxDC__DrawPointList(wxDC *self,PyObject *pyCoords,PyObject *pyPens,PyObject *pyBrushes){
             return wxPyDrawXXXList(*self, wxPyDrawXXXPoint, pyCoords, pyPens, pyBrushes);
         }


@@ -586,19 +826,108 @@ static void wxDC_GetBoundingBox(wxDC* dc, int* x1, int* y1, int* x2, int* y2) {
 }
 
 
 }
 
 

+//-=-=-=-=-=-=-=-=-=-=-    
+
+#if 1
+// Use the standard wxBufferedDC
+#include <wx/dcbuffer.h>
+
+#else
+
+//  Or, temporarily put a set of classes here similar to the old buffered DC
+//  classes until the real ones can be fixed to work "correctly" again.
+
+class wxBufferedDC : public wxMemoryDC
+{
+private:
+    wxDC        *m_dc;
+    wxBitmap    m_buffer;
+
+public:
+
+    wxBufferedDC() : m_dc( 0 ) {}
+    
+    wxBufferedDC( wxDC *dc, const wxBitmap &buffer )
+        : m_dc( dc ), m_buffer( buffer )
+    {
+        SelectObject( m_buffer );
+    }
+       
+    wxBufferedDC( wxDC *dc, const wxSize &area )
+        : m_dc( dc ), m_buffer( area.GetWidth(), area.GetHeight() )
+    {
+        SelectObject( m_buffer );
+    }
+
+    ~wxBufferedDC() {
+        if( m_dc != 0 )
+            UnMask();
+    }
+
+
+    void Init( wxDC *dc, const wxBitmap &buffer ) {
+        wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap,
+                      _T("wxBufferedDC already initialised") );
+        m_dc = dc;
+        m_buffer = buffer;
+        SelectObject( m_buffer );
+    }
+
+    void Init( wxDC *dc, const wxSize &area ) {
+        wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap,
+                      _T("wxBufferedDC already initialised") );
+        m_dc = dc;
+        m_buffer = wxBitmap( area.GetWidth(), area.GetHeight() );
+        SelectObject( m_buffer );
+    }
+
+    void UnMask() {
+        wxASSERT_MSG( m_dc != 0, _T("No low level DC associated with buffer (anymore)") );
+        m_dc->Blit( 0, 0, m_buffer.GetWidth(), m_buffer.GetHeight(), this, 0, 0 );
+        m_dc = 0;
+    }
+};
+ 
+
+class wxBufferedPaintDC : public wxBufferedDC
+{
+private:
+    wxPaintDC    m_paintdc;
+
+public:
+    wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer = wxNullBitmap )
+        : m_paintdc( window )
+    {
+        window->PrepareDC( m_paintdc );
+
+        if( buffer != wxNullBitmap )
+            Init( &m_paintdc, buffer );
+        else
+            Init( &m_paintdc, window->GetClientSize() );
+    }
+        
+    ~wxBufferedPaintDC() {
+        UnMask();
+    }
+};
+
+#endif
+//-=-=-=-=-=-=-=-=-=-=-    
+
+

 #include <wx/dcps.h>
 
 
 class wxMetaFile : public wxObject {
 public:
     wxMetaFile(const wxString&)
 #include <wx/dcps.h>
 
 
 class wxMetaFile : public wxObject {
 public:
     wxMetaFile(const wxString&)

-        { PyErr_SetNone(PyExc_NotImplementedError); }
+        { wxPyRaiseNotImplemented(); }

 };
 
 class wxMetaFileDC : public wxClientDC {
 public:
     wxMetaFileDC(const wxString&, int, int, const wxString&)
 };
 
 class wxMetaFileDC : public wxClientDC {
 public:
     wxMetaFileDC(const wxString&, int, int, const wxString&)

-        { PyErr_SetNone(PyExc_NotImplementedError); }
+        { wxPyRaiseNotImplemented(); }

 };
 
 
 };
 
 


@@ -606,10 +935,10 @@ public:
 class  wxPrinterDC : public wxClientDC {
 public:
     wxPrinterDC(const wxPrintData&)
 class  wxPrinterDC : public wxClientDC {
 public:
     wxPrinterDC(const wxPrintData&)

-        { PyErr_SetNone(PyExc_NotImplementedError); }
-    
+        { wxPyRaiseNotImplemented(); }
+

 //     wxPrinterDC(const wxString&, const wxString&, const wxString&, bool, int)
 //     wxPrinterDC(const wxString&, const wxString&, const wxString&, bool, int)

-//         { PyErr_SetNone(PyExc_NotImplementedError); }
+//         { wxPyRaiseNotImplemented(); }

 };
 
 
 };
 
 


@@ -618,9 +947,6 @@ void wxColourDatabase_Append(wxColourDatabase *self,wxString const &name,int red
             self->AddColour(name, wxColour(red, green, blue));
         }
 
             self->AddColour(name, wxColour(red, green, blue));
         }
 

-#include <wx/generic/dragimgg.h>
-
-

 #include <wx/effects.h>
 
 #ifdef __cplusplus
 #include <wx/effects.h>
 
 #ifdef __cplusplus


@@ -641,7 +967,7 @@ static PyObject *_wrap_new_GDIObject(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGDIObject, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGDIObject, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -657,7 +983,8 @@ static PyObject *_wrap_delete_GDIObject(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_GDIObject",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_GDIObject",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGDIObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGDIObject,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -682,7 +1009,8 @@ static PyObject *_wrap_GDIObject_GetVisible(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GDIObject_GetVisible",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GDIObject_GetVisible",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGDIObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGDIObject,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetVisible();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetVisible();


@@ -690,7 +1018,9 @@ static PyObject *_wrap_GDIObject_GetVisible(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -708,8 +1038,9 @@ static PyObject *_wrap_GDIObject_SetVisible(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GDIObject_SetVisible",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GDIObject_SetVisible",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGDIObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGDIObject,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -735,7 +1066,8 @@ static PyObject *_wrap_GDIObject_IsNull(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GDIObject_IsNull",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GDIObject_IsNull",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGDIObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGDIObject,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->IsNull();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->IsNull();


@@ -743,7 +1075,9 @@ static PyObject *_wrap_GDIObject_IsNull(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -772,15 +1106,15 @@ static PyObject *_wrap_new_Colour(PyObject *self, PyObject *args, PyObject *kwar
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_Colour",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_Colour",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {

-        arg1 = (unsigned char) PyInt_AsLong(obj0);
+        arg1 = (unsigned char) SWIG_AsUnsignedChar(obj0); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {

-        arg2 = (unsigned char) PyInt_AsLong(obj1);
+        arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {

-        arg3 = (unsigned char) PyInt_AsLong(obj2);
+        arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -790,31 +1124,7 @@ static PyObject *_wrap_new_Colour(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColour, 1);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_delete_Colour(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxColour *arg1 = (wxColour *) 0 ;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Colour",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        delete arg1;
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxColour, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -825,7 +1135,7 @@ static PyObject *_wrap_new_NamedColour(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxColour *result;
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxColour *result;

-    bool temp1 = false ;
+    bool temp1 = False ;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "colorName", NULL 
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "colorName", NULL 


@@ -835,7 +1145,7 @@ static PyObject *_wrap_new_NamedColour(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;

-        temp1 = true;
+        temp1 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -844,7 +1154,7 @@ static PyObject *_wrap_new_NamedColour(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColour, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxColour, 1);

     {
         if (temp1)
         delete arg1;
     {
         if (temp1)
         delete arg1;


@@ -869,7 +1179,7 @@ static PyObject *_wrap_new_ColourRGB(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_ColourRGB",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_ColourRGB",kwnames,&obj0)) goto fail;

-    arg1 = (unsigned long) PyInt_AsLong(obj0);
+    arg1 = (unsigned long) SWIG_AsUnsignedLong(obj0); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -878,7 +1188,32 @@ static PyObject *_wrap_new_ColourRGB(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColour, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxColour, 1);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_delete_Colour(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxColour *arg1 = (wxColour *) 0 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Colour",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        delete arg1;
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -895,7 +1230,8 @@ static PyObject *_wrap_Colour_Red(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_Red",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_Red",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (unsigned char)(arg1)->Red();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (unsigned char)(arg1)->Red();


@@ -903,7 +1239,7 @@ static PyObject *_wrap_Colour_Red(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromUnsignedChar((unsigned char)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -920,7 +1256,8 @@ static PyObject *_wrap_Colour_Green(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_Green",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_Green",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (unsigned char)(arg1)->Green();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (unsigned char)(arg1)->Green();


@@ -928,7 +1265,7 @@ static PyObject *_wrap_Colour_Green(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromUnsignedChar((unsigned char)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -945,7 +1282,8 @@ static PyObject *_wrap_Colour_Blue(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_Blue",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_Blue",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (unsigned char)(arg1)->Blue();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (unsigned char)(arg1)->Blue();


@@ -953,7 +1291,7 @@ static PyObject *_wrap_Colour_Blue(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromUnsignedChar((unsigned char)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -970,7 +1308,8 @@ static PyObject *_wrap_Colour_Ok(PyObject *self, PyObject *args, PyObject *kwarg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_Ok",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_Ok",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();


@@ -978,7 +1317,9 @@ static PyObject *_wrap_Colour_Ok(PyObject *self, PyObject *args, PyObject *kwarg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1000,12 +1341,13 @@ static PyObject *_wrap_Colour_Set(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Colour_Set",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Colour_Set",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = (unsigned char) PyInt_AsLong(obj1);
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     if (PyErr_Occurred()) SWIG_fail;

-    arg3 = (unsigned char) PyInt_AsLong(obj2);
+    arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2); 

     if (PyErr_Occurred()) SWIG_fail;
     if (PyErr_Occurred()) SWIG_fail;

-    arg4 = (unsigned char) PyInt_AsLong(obj3);
+    arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -1021,7 +1363,7 @@ static PyObject *_wrap_Colour_Set(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
 }
 
 

-static PyObject *_wrap_Colour_SetRBG(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Colour_SetRGB(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     unsigned long arg2 ;
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     unsigned long arg2 ;


@@ -1031,9 +1373,10 @@ static PyObject *_wrap_Colour_SetRBG(PyObject *self, PyObject *args, PyObject *k
         (char *) "self",(char *) "colRGB", NULL 
     };
     
         (char *) "self",(char *) "colRGB", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour_SetRBG",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = (unsigned long) PyInt_AsLong(obj1);
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour_SetRGB",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (unsigned long) SWIG_AsUnsignedLong(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -1049,6 +1392,73 @@ static PyObject *_wrap_Colour_SetRBG(PyObject *self, PyObject *args, PyObject *k
 }
 
 
 }
 
 

+static PyObject *_wrap_Colour_SetFromName(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxColour *arg1 = (wxColour *) 0 ;
+    wxString *arg2 = 0 ;
+    bool temp2 = False ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "colourName", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour_SetFromName",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        arg2 = wxString_in_helper(obj1);
+        if (arg2 == NULL) SWIG_fail;
+        temp2 = True;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->InitFromName((wxString const &)*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        if (temp2)
+        delete arg2;
+    }
+    return resultobj;
+    fail:
+    {
+        if (temp2)
+        delete arg2;
+    }
+    return NULL;
+}
+
+
+static PyObject *_wrap_Colour_GetPixel(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxColour *arg1 = (wxColour *) 0 ;
+    long result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_GetPixel",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (long)((wxColour const *)arg1)->GetPixel();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_FromLong((long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+

 static PyObject *_wrap_Colour___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
 static PyObject *_wrap_Colour___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;


@@ -1062,7 +1472,8 @@ static PyObject *_wrap_Colour___eq__(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___eq__",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___eq__",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;


@@ -1074,7 +1485,9 @@ static PyObject *_wrap_Colour___eq__(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1094,7 +1507,8 @@ static PyObject *_wrap_Colour___ne__(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___ne__",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___ne__",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;


@@ -1106,7 +1520,9 @@ static PyObject *_wrap_Colour___ne__(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1123,7 +1539,8 @@ static PyObject *_wrap_Colour_Get(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_Get",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_Get",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxColour_Get(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxColour_Get(arg1);


@@ -1138,13 +1555,39 @@ static PyObject *_wrap_Colour_Get(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
 }
 
 

-static PyObject * Colour_swigregister(PyObject *self, PyObject *args) {
-    PyObject *obj;
-    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
-    SWIG_TypeClientData(SWIGTYPE_p_wxColour, obj);
-    Py_INCREF(obj);
-    return Py_BuildValue((char *)"");
-}
+static PyObject *_wrap_Colour_GetRGB(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxColour *arg1 = (wxColour *) 0 ;
+    unsigned long result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_GetRGB",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (unsigned long)wxColour_GetRGB(arg1);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject * Colour_swigregister(PyObject *self, PyObject *args) {
+    PyObject *obj;
+    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
+    SWIG_TypeClientData(SWIGTYPE_p_wxColour, obj);
+    Py_INCREF(obj);
+    return Py_BuildValue((char *)"");
+}

 static PyObject *_wrap_new_Palette(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
 static PyObject *_wrap_new_Palette(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;


@@ -1152,6 +1595,7 @@ static PyObject *_wrap_new_Palette(PyObject *self, PyObject *args, PyObject *kwa
     unsigned char *arg3 = (unsigned char *) 0 ;
     unsigned char *arg4 = (unsigned char *) 0 ;
     wxPalette *result;
     unsigned char *arg3 = (unsigned char *) 0 ;
     unsigned char *arg4 = (unsigned char *) 0 ;
     wxPalette *result;

+    PyObject * obj0 = 0 ;

     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;


@@ -1159,10 +1603,15 @@ static PyObject *_wrap_new_Palette(PyObject *self, PyObject *args, PyObject *kwa
         (char *) "n",(char *) "red",(char *) "green",(char *) "blue", NULL 
     };
     
         (char *) "n",(char *) "red",(char *) "green",(char *) "blue", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iOOO:new_Palette",kwnames,&arg1,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:new_Palette",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    arg1 = (int) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_unsigned_char,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_unsigned_char,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_unsigned_char,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPalette *)new wxPalette(arg1,(unsigned char const *)arg2,(unsigned char const *)arg3,(unsigned char const *)arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPalette *)new wxPalette(arg1,(unsigned char const *)arg2,(unsigned char const *)arg3,(unsigned char const *)arg4);


@@ -1170,7 +1619,7 @@ static PyObject *_wrap_new_Palette(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPalette, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPalette, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1186,7 +1635,8 @@ static PyObject *_wrap_delete_Palette(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Palette",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Palette",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPalette,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -1217,12 +1667,13 @@ static PyObject *_wrap_Palette_GetPixel(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Palette_GetPixel",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Palette_GetPixel",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = (byte) PyInt_AsLong(obj1);
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPalette,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (byte) SWIG_AsUnsignedChar(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     if (PyErr_Occurred()) SWIG_fail;

-    arg3 = (byte) PyInt_AsLong(obj2);
+    arg3 = (byte) SWIG_AsUnsignedChar(obj2); 

     if (PyErr_Occurred()) SWIG_fail;
     if (PyErr_Occurred()) SWIG_fail;

-    arg4 = (byte) PyInt_AsLong(obj3);
+    arg4 = (byte) SWIG_AsUnsignedChar(obj3); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -1231,7 +1682,7 @@ static PyObject *_wrap_Palette_GetPixel(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1250,6 +1701,7 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject *
     byte temp4 ;
     byte temp5 ;
     PyObject * obj0 = 0 ;
     byte temp4 ;
     byte temp5 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "pixel", NULL 
     };
     char *kwnames[] = {
         (char *) "self",(char *) "pixel", NULL 
     };


@@ -1257,8 +1709,11 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject *
     arg3 = &temp3;
     arg4 = &temp4;
     arg5 = &temp5;
     arg3 = &temp3;
     arg4 = &temp4;
     arg5 = &temp5;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Palette_GetRGB",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Palette_GetRGB",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPalette,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetRGB(arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetRGB(arg2,arg3,arg4,arg5);


@@ -1266,7 +1721,9 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         PyObject *o = PyInt_FromLong((long) (*arg3));
         resultobj = t_output_helper(resultobj,o);
     {
         PyObject *o = PyInt_FromLong((long) (*arg3));
         resultobj = t_output_helper(resultobj,o);


@@ -1295,7 +1752,8 @@ static PyObject *_wrap_Palette_Ok(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Palette_Ok",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Palette_Ok",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPalette,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();


@@ -1303,7 +1761,9 @@ static PyObject *_wrap_Palette_Ok(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1325,15 +1785,25 @@ static PyObject *_wrap_new_Pen(PyObject *self, PyObject *args, PyObject *kwargs)
     wxPen *result;
     wxColour temp1 ;
     PyObject * obj0 = 0 ;
     wxPen *result;
     wxColour temp1 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "colour",(char *) "width",(char *) "style", NULL 
     };
     
     char *kwnames[] = {
         (char *) "colour",(char *) "width",(char *) "style", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:new_Pen",kwnames,&obj0,&arg2,&arg3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_Pen",kwnames,&obj0,&obj1,&obj2)) goto fail;

     {
         arg1 = &temp1;
         if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail;
     }
     {
         arg1 = &temp1;
         if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail;
     }

+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPen *)new wxPen(*arg1,arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPen *)new wxPen(*arg1,arg2,arg3);


@@ -1341,7 +1811,7 @@ static PyObject *_wrap_new_Pen(PyObject *self, PyObject *args, PyObject *kwargs)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1357,7 +1827,8 @@ static PyObject *_wrap_delete_Pen(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Pen",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Pen",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -1382,7 +1853,8 @@ static PyObject *_wrap_Pen_GetCap(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetCap",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetCap",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetCap();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetCap();


@@ -1390,7 +1862,7 @@ static PyObject *_wrap_Pen_GetCap(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1407,7 +1879,8 @@ static PyObject *_wrap_Pen_GetColour(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetColour",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetColour",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetColour();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetColour();


@@ -1418,7 +1891,7 @@ static PyObject *_wrap_Pen_GetColour(PyObject *self, PyObject *args, PyObject *k
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -1436,7 +1909,8 @@ static PyObject *_wrap_Pen_GetJoin(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetJoin",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetJoin",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetJoin();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetJoin();


@@ -1444,7 +1918,7 @@ static PyObject *_wrap_Pen_GetJoin(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1461,7 +1935,8 @@ static PyObject *_wrap_Pen_GetStyle(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetStyle",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetStyle",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetStyle();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetStyle();


@@ -1469,7 +1944,7 @@ static PyObject *_wrap_Pen_GetStyle(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1486,7 +1961,8 @@ static PyObject *_wrap_Pen_GetWidth(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetWidth",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetWidth",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetWidth();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetWidth();


@@ -1494,7 +1970,7 @@ static PyObject *_wrap_Pen_GetWidth(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1511,7 +1987,8 @@ static PyObject *_wrap_Pen_Ok(PyObject *self, PyObject *args, PyObject *kwargs)
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_Ok",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_Ok",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();


@@ -1519,7 +1996,9 @@ static PyObject *_wrap_Pen_Ok(PyObject *self, PyObject *args, PyObject *kwargs)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1531,12 +2010,16 @@ static PyObject *_wrap_Pen_SetCap(PyObject *self, PyObject *args, PyObject *kwar
     wxPen *arg1 = (wxPen *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxPen *arg1 = (wxPen *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "cap_style", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "cap_style", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetCap",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetCap",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetCap(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetCap(arg2);


@@ -1563,7 +2046,8 @@ static PyObject *_wrap_Pen_SetColour(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetColour",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetColour",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;


@@ -1587,12 +2071,16 @@ static PyObject *_wrap_Pen_SetJoin(PyObject *self, PyObject *args, PyObject *kwa
     wxPen *arg1 = (wxPen *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxPen *arg1 = (wxPen *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "join_style", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "join_style", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetJoin",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetJoin",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetJoin(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetJoin(arg2);


@@ -1612,12 +2100,16 @@ static PyObject *_wrap_Pen_SetStyle(PyObject *self, PyObject *args, PyObject *kw
     wxPen *arg1 = (wxPen *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxPen *arg1 = (wxPen *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "style", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "style", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetStyle",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetStyle",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetStyle(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetStyle(arg2);


@@ -1637,12 +2129,16 @@ static PyObject *_wrap_Pen_SetWidth(PyObject *self, PyObject *args, PyObject *kw
     wxPen *arg1 = (wxPen *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxPen *arg1 = (wxPen *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "width", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "width", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetWidth",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetWidth",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetWidth(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetWidth(arg2);


@@ -1669,7 +2165,8 @@ static PyObject *_wrap_Pen_SetDashes(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetDashes",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetDashes",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = PyList_Size(obj1);
         arg3 = (wxDash*)byte_LIST_helper(obj1);
     {
         arg2 = PyList_Size(obj1);
         arg3 = (wxDash*)byte_LIST_helper(obj1);


@@ -1705,7 +2202,8 @@ static PyObject *_wrap_Pen_GetDashes(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetDashes",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetDashes",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPen_GetDashes(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPen_GetDashes(arg1);


@@ -1720,6 +2218,96 @@ static PyObject *_wrap_Pen_GetDashes(PyObject *self, PyObject *args, PyObject *k
 }
 
 
 }
 
 

+static PyObject *_wrap_Pen___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPen *arg1 = (wxPen *) 0 ;
+    wxPen *arg2 = (wxPen *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "other", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen___eq__",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)wxPen___eq__(arg1,(wxPen const *)arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Pen___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPen *arg1 = (wxPen *) 0 ;
+    wxPen *arg2 = (wxPen *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "other", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen___ne__",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)wxPen___ne__(arg1,(wxPen const *)arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Pen_GetDashCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPen *arg1 = (wxPen *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetDashCount",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (int)((wxPen const *)arg1)->GetDashCount();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_FromInt((int)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+

 static PyObject * Pen_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
 static PyObject * Pen_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;


@@ -1735,15 +2323,25 @@ static PyObject *_wrap_new_PyPen(PyObject *self, PyObject *args, PyObject *kwarg
     wxPyPen *result;
     wxColour temp1 ;
     PyObject * obj0 = 0 ;
     wxPyPen *result;
     wxColour temp1 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "colour",(char *) "width",(char *) "style", NULL 
     };
     
     char *kwnames[] = {
         (char *) "colour",(char *) "width",(char *) "style", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:new_PyPen",kwnames,&obj0,&arg2,&arg3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_PyPen",kwnames,&obj0,&obj1,&obj2)) goto fail;

     {
         arg1 = &temp1;
         if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail;
     }
     {
         arg1 = &temp1;
         if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail;
     }

+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyPen *)new wxPyPen(*arg1,arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyPen *)new wxPyPen(*arg1,arg2,arg3);


@@ -1751,7 +2349,7 @@ static PyObject *_wrap_new_PyPen(PyObject *self, PyObject *args, PyObject *kwarg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyPen, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyPen, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1767,7 +2365,8 @@ static PyObject *_wrap_delete_PyPen(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PyPen",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PyPen",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -1794,7 +2393,8 @@ static PyObject *_wrap_PyPen_SetDashes(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPen_SetDashes",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPen_SetDashes",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = PyList_Size(obj1);
         arg3 = (wxDash*)byte_LIST_helper(obj1);
     {
         arg2 = PyList_Size(obj1);
         arg3 = (wxDash*)byte_LIST_helper(obj1);


@@ -1834,15 +2434,20 @@ static PyObject *_wrap_new_Brush(PyObject *self, PyObject *args, PyObject *kwarg
     wxBrush *result;
     wxColour temp1 ;
     PyObject * obj0 = 0 ;
     wxBrush *result;
     wxColour temp1 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "colour",(char *) "style", NULL 
     };
     
     char *kwnames[] = {
         (char *) "colour",(char *) "style", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_Brush",kwnames,&obj0,&arg2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Brush",kwnames,&obj0,&obj1)) goto fail;

     {
         arg1 = &temp1;
         if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail;
     }
     {
         arg1 = &temp1;
         if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail;
     }

+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxBrush *)new wxBrush((wxColour const &)*arg1,arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxBrush *)new wxBrush((wxColour const &)*arg1,arg2);


@@ -1850,7 +2455,7 @@ static PyObject *_wrap_new_Brush(PyObject *self, PyObject *args, PyObject *kwarg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -1866,7 +2471,8 @@ static PyObject *_wrap_delete_Brush(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Brush",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Brush",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -1893,7 +2499,8 @@ static PyObject *_wrap_Brush_SetColour(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Brush_SetColour",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Brush_SetColour",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;


@@ -1917,12 +2524,16 @@ static PyObject *_wrap_Brush_SetStyle(PyObject *self, PyObject *args, PyObject *
     wxBrush *arg1 = (wxBrush *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxBrush *arg1 = (wxBrush *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "style", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "style", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Brush_SetStyle",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Brush_SetStyle",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetStyle(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetStyle(arg2);


@@ -1948,10 +2559,14 @@ static PyObject *_wrap_Brush_SetStipple(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Brush_SetStipple",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Brush_SetStipple",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -1977,7 +2592,8 @@ static PyObject *_wrap_Brush_GetColour(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Brush_GetColour",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Brush_GetColour",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxBrush const *)arg1)->GetColour();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxBrush const *)arg1)->GetColour();


@@ -1988,7 +2604,7 @@ static PyObject *_wrap_Brush_GetColour(PyObject *self, PyObject *args, PyObject
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -2006,7 +2622,8 @@ static PyObject *_wrap_Brush_GetStyle(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Brush_GetStyle",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Brush_GetStyle",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxBrush const *)arg1)->GetStyle();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxBrush const *)arg1)->GetStyle();


@@ -2014,7 +2631,7 @@ static PyObject *_wrap_Brush_GetStyle(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2031,7 +2648,8 @@ static PyObject *_wrap_Brush_GetStipple(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Brush_GetStipple",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Brush_GetStipple",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxBitmap *)((wxBrush const *)arg1)->GetStipple();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxBitmap *)((wxBrush const *)arg1)->GetStipple();


@@ -2039,7 +2657,7 @@ static PyObject *_wrap_Brush_GetStipple(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBitmap, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 0);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2056,7 +2674,8 @@ static PyObject *_wrap_Brush_Ok(PyObject *self, PyObject *args, PyObject *kwargs
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Brush_Ok",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Brush_Ok",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();


@@ -2064,7 +2683,9 @@ static PyObject *_wrap_Brush_Ok(PyObject *self, PyObject *args, PyObject *kwargs
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2083,17 +2704,22 @@ static PyObject *_wrap_new_Bitmap(PyObject *self, PyObject *args, PyObject *kwar
     wxString *arg1 = 0 ;
     int arg2 = (int) wxBITMAP_TYPE_ANY ;
     wxBitmap *result;
     wxString *arg1 = 0 ;
     int arg2 = (int) wxBITMAP_TYPE_ANY ;
     wxBitmap *result;

-    bool temp1 = false ;
+    bool temp1 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "name",(char *) "type", NULL 
     };
     
     char *kwnames[] = {
         (char *) "name",(char *) "type", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_Bitmap",kwnames,&obj0,&arg2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Bitmap",kwnames,&obj0,&obj1)) goto fail;

     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;

-        temp1 = true;
+        temp1 = True;
+    }
+    if (obj1) {
+        arg2 = (wxBitmapType) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -2102,7 +2728,7 @@ static PyObject *_wrap_new_Bitmap(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBitmap, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 1);

     {
         if (temp1)
         delete arg1;
     {
         if (temp1)
         delete arg1;


@@ -2126,7 +2752,8 @@ static PyObject *_wrap_delete_Bitmap(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Bitmap",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Bitmap",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -2147,11 +2774,22 @@ static PyObject *_wrap_new_EmptyBitmap(PyObject *self, PyObject *args, PyObject
     int arg2 ;
     int arg3 = (int) -1 ;
     wxBitmap *result;
     int arg2 ;
     int arg3 = (int) -1 ;
     wxBitmap *result;

+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "width",(char *) "height",(char *) "depth", NULL 
     };
     
     char *kwnames[] = {
         (char *) "width",(char *) "height",(char *) "depth", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii|i:new_EmptyBitmap",kwnames,&arg1,&arg2,&arg3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_EmptyBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    arg1 = (int) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxBitmap *)new wxBitmap(arg1,arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxBitmap *)new wxBitmap(arg1,arg2,arg3);


@@ -2159,7 +2797,7 @@ static PyObject *_wrap_new_EmptyBitmap(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBitmap, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2176,9 +2814,12 @@ static PyObject *_wrap_new_BitmapFromIcon(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_BitmapFromIcon",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_BitmapFromIcon",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -2187,7 +2828,7 @@ static PyObject *_wrap_new_BitmapFromIcon(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBitmap, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2200,14 +2841,22 @@ static PyObject *_wrap_new_BitmapFromImage(PyObject *self, PyObject *args, PyObj
     int arg2 = (int) -1 ;
     wxBitmap *result;
     PyObject * obj0 = 0 ;
     int arg2 = (int) -1 ;
     wxBitmap *result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "image",(char *) "depth", NULL 
     };
     
     char *kwnames[] = {
         (char *) "image",(char *) "depth", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_BitmapFromImage",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BitmapFromImage",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
+    }
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -2216,7 +2865,7 @@ static PyObject *_wrap_new_BitmapFromImage(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBitmap, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2241,7 +2890,7 @@ static PyObject *_wrap_new_BitmapFromXPMData(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBitmap, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2256,12 +2905,23 @@ static PyObject *_wrap_new_BitmapFromBits(PyObject *self, PyObject *args, PyObje
     int arg4 = (int) 1 ;
     wxBitmap *result;
     PyObject * obj0 = 0 ;
     int arg4 = (int) 1 ;
     wxBitmap *result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
         (char *) "bits",(char *) "width",(char *) "height",(char *) "depth", NULL 
     };
     
     char *kwnames[] = {
         (char *) "bits",(char *) "width",(char *) "height",(char *) "depth", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:new_BitmapFromBits",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:new_BitmapFromBits",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

     arg1 = obj0;
     arg1 = obj0;

+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxBitmap *)new_wxBitmap(arg1,arg2,arg3,arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxBitmap *)new_wxBitmap(arg1,arg2,arg3,arg4);


@@ -2269,7 +2929,7 @@ static PyObject *_wrap_new_BitmapFromBits(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBitmap, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2286,7 +2946,8 @@ static PyObject *_wrap_Bitmap_Ok(PyObject *self, PyObject *args, PyObject *kwarg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_Ok",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_Ok",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();


@@ -2294,7 +2955,9 @@ static PyObject *_wrap_Bitmap_Ok(PyObject *self, PyObject *args, PyObject *kwarg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2311,7 +2974,8 @@ static PyObject *_wrap_Bitmap_GetWidth(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_GetWidth",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_GetWidth",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetWidth();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetWidth();


@@ -2319,7 +2983,7 @@ static PyObject *_wrap_Bitmap_GetWidth(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2336,7 +3000,8 @@ static PyObject *_wrap_Bitmap_GetHeight(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_GetHeight",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_GetHeight",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetHeight();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetHeight();


@@ -2344,7 +3009,7 @@ static PyObject *_wrap_Bitmap_GetHeight(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2361,7 +3026,8 @@ static PyObject *_wrap_Bitmap_GetDepth(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_GetDepth",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_GetDepth",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetDepth();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetDepth();


@@ -2369,7 +3035,7 @@ static PyObject *_wrap_Bitmap_GetDepth(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2386,7 +3052,8 @@ static PyObject *_wrap_Bitmap_ConvertToImage(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_ConvertToImage",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_ConvertToImage",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxBitmap const *)arg1)->ConvertToImage();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxBitmap const *)arg1)->ConvertToImage();


@@ -2397,7 +3064,7 @@ static PyObject *_wrap_Bitmap_ConvertToImage(PyObject *self, PyObject *args, PyO
     {
         wxImage * resultptr;
         resultptr = new wxImage((wxImage &) result);
     {
         wxImage * resultptr;
         resultptr = new wxImage((wxImage &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxImage, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxImage, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -2415,7 +3082,8 @@ static PyObject *_wrap_Bitmap_GetMask(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_GetMask",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_GetMask",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxMask *)((wxBitmap const *)arg1)->GetMask();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxMask *)((wxBitmap const *)arg1)->GetMask();


@@ -2423,7 +3091,7 @@ static PyObject *_wrap_Bitmap_GetMask(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMask, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMask, 0);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2441,8 +3109,10 @@ static PyObject *_wrap_Bitmap_SetMask(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetMask",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetMask",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMask,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMask,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetMask(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetMask(arg2);


@@ -2469,7 +3139,8 @@ static PyObject *_wrap_Bitmap_SetMaskColour(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetMaskColour",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetMaskColour",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;


@@ -2501,7 +3172,8 @@ static PyObject *_wrap_Bitmap_GetSubBitmap(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_GetSubBitmap",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_GetSubBitmap",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;


@@ -2516,7 +3188,7 @@ static PyObject *_wrap_Bitmap_GetSubBitmap(PyObject *self, PyObject *args, PyObj
     {
         wxBitmap * resultptr;
         resultptr = new wxBitmap((wxBitmap &) result);
     {
         wxBitmap * resultptr;
         resultptr = new wxBitmap((wxBitmap &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxBitmap, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxBitmap, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -2531,23 +3203,28 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject
     int arg3 ;
     wxPalette *arg4 = (wxPalette *) (wxPalette *) NULL ;
     bool result;
     int arg3 ;
     wxPalette *arg4 = (wxPalette *) (wxPalette *) NULL ;
     bool result;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;

     PyObject * obj3 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "name",(char *) "type",(char *) "palette", NULL 
     };
     
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "name",(char *) "type",(char *) "palette", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|O:Bitmap_SaveFile",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Bitmap_SaveFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     }

+    arg3 = (wxBitmapType) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     if (obj3) {
     if (obj3) {

-        if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxPalette,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -2556,7 +3233,9 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp2)
         delete arg2;
     {
         if (temp2)
         delete arg2;


@@ -2577,20 +3256,24 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject
     wxString *arg2 = 0 ;
     int arg3 ;
     bool result;
     wxString *arg2 = 0 ;
     int arg3 ;
     bool result;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "name",(char *) "type", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "name",(char *) "type", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Bitmap_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Bitmap_LoadFile",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     }

+    arg3 = (wxBitmapType) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->LoadFile((wxString const &)*arg2,(wxBitmapType )arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->LoadFile((wxString const &)*arg2,(wxBitmapType )arg3);


@@ -2598,7 +3281,9 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp2)
         delete arg2;
     {
         if (temp2)
         delete arg2;


@@ -2625,10 +3310,14 @@ static PyObject *_wrap_Bitmap_CopyFromIcon(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_CopyFromIcon",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_CopyFromIcon",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -2637,7 +3326,9 @@ static PyObject *_wrap_Bitmap_CopyFromIcon(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2649,12 +3340,16 @@ static PyObject *_wrap_Bitmap_SetHeight(PyObject *self, PyObject *args, PyObject
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "height", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "height", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetHeight",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetHeight",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetHeight(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetHeight(arg2);


@@ -2674,12 +3369,16 @@ static PyObject *_wrap_Bitmap_SetWidth(PyObject *self, PyObject *args, PyObject
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "width", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "width", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetWidth",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetWidth",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetWidth(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetWidth(arg2);


@@ -2699,12 +3398,16 @@ static PyObject *_wrap_Bitmap_SetDepth(PyObject *self, PyObject *args, PyObject
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "depth", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "depth", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetDepth",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetDepth",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetDepth(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetDepth(arg2);


@@ -2719,45 +3422,82 @@ static PyObject *_wrap_Bitmap_SetDepth(PyObject *self, PyObject *args, PyObject
 }
 
 
 }
 
 

-static PyObject * Bitmap_swigregister(PyObject *self, PyObject *args) {
-    PyObject *obj;
-    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
-    SWIG_TypeClientData(SWIGTYPE_p_wxBitmap, obj);
-    Py_INCREF(obj);
-    return Py_BuildValue((char *)"");
-}
-static PyObject *_wrap_new_Mask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxBitmap *arg1 = 0 ;
-    wxMask *result;
+    wxBitmap *arg1 = (wxBitmap *) 0 ;
+    wxBitmap *arg2 = (wxBitmap *) 0 ;
+    bool result;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "bitmap", NULL 
+        (char *) "self",(char *) "other", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_Mask",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg1 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap___eq__",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)wxBitmap___eq__(arg1,(wxBitmap const *)arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;

     }
     }

+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Bitmap___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxBitmap *arg1 = (wxBitmap *) 0 ;
+    wxBitmap *arg2 = (wxBitmap *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "other", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap___ne__",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxMask *)new wxMask((wxBitmap const &)*arg1);
+        result = (bool)wxBitmap___ne__(arg1,(wxBitmap const *)arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMask, 1);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_new_MaskColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject * Bitmap_swigregister(PyObject *self, PyObject *args) {
+    PyObject *obj;
+    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
+    SWIG_TypeClientData(SWIGTYPE_p_wxBitmap, obj);
+    Py_INCREF(obj);
+    return Py_BuildValue((char *)"");
+}
+static PyObject *_wrap_new_Mask(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxBitmap *arg1 = 0 ;
     PyObject *resultobj;
     wxBitmap *arg1 = 0 ;

-    wxColour *arg2 = 0 ;
+    wxColour const &arg2_defvalue = wxNullColour ;
+    wxColour *arg2 = (wxColour *) &arg2_defvalue ;

     wxMask *result;
     wxColour temp2 ;
     PyObject * obj0 = 0 ;
     wxMask *result;
     wxColour temp2 ;
     PyObject * obj0 = 0 ;


@@ -2766,23 +3506,28 @@ static PyObject *_wrap_new_MaskColour(PyObject *self, PyObject *args, PyObject *
         (char *) "bitmap",(char *) "colour", NULL 
     };
     
         (char *) "bitmap",(char *) "colour", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_MaskColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Mask",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     }

-    {
-        arg2 = &temp2;
-        if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+    if (obj1) {
+        {
+            arg2 = &temp2;
+            if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+        }

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxMask *)new wxMask((wxBitmap const &)*arg1,(wxColour const &)*arg2);
+        result = (wxMask *)new_wxMask((wxBitmap const &)*arg1,(wxColour const &)*arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMask, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMask, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2799,30 +3544,43 @@ static PyObject * Mask_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
 static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;

-    long arg2 ;
+    int arg2 ;

     int arg3 = (int) -1 ;
     int arg4 = (int) -1 ;
     wxIcon *result;
     int arg3 = (int) -1 ;
     int arg4 = (int) -1 ;
     wxIcon *result;

-    bool temp1 = false ;
+    bool temp1 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "name",(char *) "flags",(char *) "desiredWidth",(char *) "desiredHeight", NULL 
+        (char *) "name",(char *) "type",(char *) "desiredWidth",(char *) "desiredHeight", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_Icon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;

-        temp1 = true;
+        temp1 = True;
+    }
+    arg2 = (wxBitmapType) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxIcon *)new wxIcon((wxString const &)*arg1,arg2,arg3,arg4);
+        result = (wxIcon *)new wxIcon((wxString const &)*arg1,(wxBitmapType )arg2,arg3,arg4);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIcon, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIcon, 1);

     {
         if (temp1)
         delete arg1;
     {
         if (temp1)
         delete arg1;


@@ -2846,7 +3604,8 @@ static PyObject *_wrap_delete_Icon(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Icon",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Icon",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -2876,7 +3635,7 @@ static PyObject *_wrap_new_EmptyIcon(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIcon, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIcon, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2893,9 +3652,12 @@ static PyObject *_wrap_new_IconFromLocation(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconFromLocation",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconFromLocation",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconLocation,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIconLocation,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -2904,7 +3666,7 @@ static PyObject *_wrap_new_IconFromLocation(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIcon, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIcon, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2921,9 +3683,12 @@ static PyObject *_wrap_new_IconFromBitmap(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconFromBitmap",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconFromBitmap",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -2932,7 +3697,7 @@ static PyObject *_wrap_new_IconFromBitmap(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIcon, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIcon, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2957,7 +3722,7 @@ static PyObject *_wrap_new_IconFromXPMData(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIcon, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIcon, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -2968,30 +3733,36 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxIcon *arg1 = (wxIcon *) 0 ;
     wxString *arg2 = 0 ;
     PyObject *resultobj;
     wxIcon *arg1 = (wxIcon *) 0 ;
     wxString *arg2 = 0 ;

-    long arg3 ;
+    int arg3 ;

     bool result;
     bool result;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self",(char *) "name",(char *) "flags", NULL 
+        (char *) "self",(char *) "name",(char *) "type", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:Icon_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Icon_LoadFile",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     }

+    arg3 = (wxBitmapType) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)(arg1)->LoadFile((wxString const &)*arg2,arg3);
+        result = (bool)(arg1)->LoadFile((wxString const &)*arg2,(wxBitmapType )arg3);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp2)
         delete arg2;
     {
         if (temp2)
         delete arg2;


@@ -3016,7 +3787,8 @@ static PyObject *_wrap_Icon_Ok(PyObject *self, PyObject *args, PyObject *kwargs)
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Icon_Ok",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Icon_Ok",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();


@@ -3024,7 +3796,9 @@ static PyObject *_wrap_Icon_Ok(PyObject *self, PyObject *args, PyObject *kwargs)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3041,7 +3815,8 @@ static PyObject *_wrap_Icon_GetWidth(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Icon_GetWidth",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Icon_GetWidth",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetWidth();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetWidth();


@@ -3049,7 +3824,7 @@ static PyObject *_wrap_Icon_GetWidth(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3066,7 +3841,8 @@ static PyObject *_wrap_Icon_GetHeight(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Icon_GetHeight",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Icon_GetHeight",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetHeight();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetHeight();


@@ -3074,7 +3850,7 @@ static PyObject *_wrap_Icon_GetHeight(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3091,7 +3867,8 @@ static PyObject *_wrap_Icon_GetDepth(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Icon_GetDepth",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Icon_GetDepth",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetDepth();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetDepth();


@@ -3099,7 +3876,7 @@ static PyObject *_wrap_Icon_GetDepth(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3111,12 +3888,16 @@ static PyObject *_wrap_Icon_SetWidth(PyObject *self, PyObject *args, PyObject *k
     wxIcon *arg1 = (wxIcon *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxIcon *arg1 = (wxIcon *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "w", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "w", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Icon_SetWidth",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetWidth",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetWidth(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetWidth(arg2);


@@ -3136,12 +3917,16 @@ static PyObject *_wrap_Icon_SetHeight(PyObject *self, PyObject *args, PyObject *
     wxIcon *arg1 = (wxIcon *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxIcon *arg1 = (wxIcon *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "h", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "h", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Icon_SetHeight",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetHeight",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetHeight(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetHeight(arg2);


@@ -3161,12 +3946,16 @@ static PyObject *_wrap_Icon_SetDepth(PyObject *self, PyObject *args, PyObject *k
     wxIcon *arg1 = (wxIcon *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxIcon *arg1 = (wxIcon *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "d", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "d", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Icon_SetDepth",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetDepth",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetDepth(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetDepth(arg2);


@@ -3192,10 +3981,14 @@ static PyObject *_wrap_Icon_CopyFromBitmap(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_CopyFromBitmap",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_CopyFromBitmap",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -3223,14 +4016,24 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject
     wxString *arg1 = (wxString *) &wxPyEmptyString ;
     int arg2 = (int) 0 ;
     wxIconLocation *result;
     wxString *arg1 = (wxString *) &wxPyEmptyString ;
     int arg2 = (int) 0 ;
     wxIconLocation *result;

+    bool temp1 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "filename",(char *) "num", NULL 
     };
     
     char *kwnames[] = {
         (char *) "filename",(char *) "num", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_IconLocation",kwnames,&obj0,&arg2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_IconLocation",kwnames,&obj0,&obj1)) goto fail;

     if (obj0) {
     if (obj0) {

-        if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        {
+            arg1 = wxString_in_helper(obj0);
+            if (arg1 == NULL) SWIG_fail;
+            temp1 = True;
+        }
+    }
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -3239,9 +4042,17 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIconLocation, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIconLocation, 1);
+    {
+        if (temp1)
+        delete arg1;
+    }

     return resultobj;
     fail:
     return resultobj;
     fail:

+    {
+        if (temp1)
+        delete arg1;
+    }

     return NULL;
 }
 
     return NULL;
 }
 


@@ -3255,7 +4066,8 @@ static PyObject *_wrap_delete_IconLocation(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_IconLocation",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_IconLocation",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconLocation,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIconLocation,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -3280,7 +4092,8 @@ static PyObject *_wrap_IconLocation_IsOk(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IconLocation_IsOk",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IconLocation_IsOk",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconLocation,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIconLocation,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxIconLocation const *)arg1)->IsOk();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxIconLocation const *)arg1)->IsOk();


@@ -3288,7 +4101,9 @@ static PyObject *_wrap_IconLocation_IsOk(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3299,7 +4114,7 @@ static PyObject *_wrap_IconLocation_SetFileName(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxIconLocation *arg1 = (wxIconLocation *) 0 ;
     wxString *arg2 = 0 ;
     PyObject *resultobj;
     wxIconLocation *arg1 = (wxIconLocation *) 0 ;
     wxString *arg2 = 0 ;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -3307,11 +4122,12 @@ static PyObject *_wrap_IconLocation_SetFileName(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconLocation_SetFileName",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconLocation_SetFileName",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconLocation,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIconLocation,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -3345,7 +4161,8 @@ static PyObject *_wrap_IconLocation_GetFileName(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IconLocation_GetFileName",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IconLocation_GetFileName",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconLocation,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIconLocation,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {


@@ -3356,7 +4173,13 @@ static PyObject *_wrap_IconLocation_GetFileName(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0);
+    {
+#if wxUSE_UNICODE
+        resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
+#else
+        resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
+#endif
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3368,12 +4191,16 @@ static PyObject *_wrap_IconLocation_SetIndex(PyObject *self, PyObject *args, PyO
     wxIconLocation *arg1 = (wxIconLocation *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxIconLocation *arg1 = (wxIconLocation *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "num", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "num", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IconLocation_SetIndex",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconLocation,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconLocation_SetIndex",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIconLocation,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxIconLocation_SetIndex(arg1,arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxIconLocation_SetIndex(arg1,arg2);


@@ -3398,7 +4225,8 @@ static PyObject *_wrap_IconLocation_GetIndex(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IconLocation_GetIndex",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IconLocation_GetIndex",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconLocation,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIconLocation,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)wxIconLocation_GetIndex(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)wxIconLocation_GetIndex(arg1);


@@ -3406,7 +4234,7 @@ static PyObject *_wrap_IconLocation_GetIndex(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3435,7 +4263,7 @@ static PyObject *_wrap_new_IconBundle(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIconBundle, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIconBundle, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3447,18 +4275,21 @@ static PyObject *_wrap_new_IconBundleFromFile(PyObject *self, PyObject *args, Py
     wxString *arg1 = 0 ;
     long arg2 ;
     wxIconBundle *result;
     wxString *arg1 = 0 ;
     long arg2 ;
     wxIconBundle *result;

-    bool temp1 = false ;
+    bool temp1 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "file",(char *) "type", NULL 
     };
     
     char *kwnames[] = {
         (char *) "file",(char *) "type", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:new_IconBundleFromFile",kwnames,&obj0,&arg2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_IconBundleFromFile",kwnames,&obj0,&obj1)) goto fail;

     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;

-        temp1 = true;
+        temp1 = True;

     }
     }

+    arg2 = (long) SWIG_AsLong(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxIconBundle *)new wxIconBundle((wxString const &)*arg1,arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxIconBundle *)new wxIconBundle((wxString const &)*arg1,arg2);


@@ -3466,7 +4297,7 @@ static PyObject *_wrap_new_IconBundleFromFile(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIconBundle, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIconBundle, 1);

     {
         if (temp1)
         delete arg1;
     {
         if (temp1)
         delete arg1;


@@ -3491,9 +4322,12 @@ static PyObject *_wrap_new_IconBundleFromIcon(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconBundleFromIcon",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconBundleFromIcon",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -3502,7 +4336,7 @@ static PyObject *_wrap_new_IconBundleFromIcon(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIconBundle, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIconBundle, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3518,7 +4352,8 @@ static PyObject *_wrap_delete_IconBundle(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_IconBundle",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_IconBundle",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconBundle,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIconBundle,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -3544,10 +4379,14 @@ static PyObject *_wrap_IconBundle_AddIcon(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconBundle_AddIcon",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconBundle_AddIcon",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconBundle,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIconBundle,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -3568,20 +4407,24 @@ static PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *self, PyObject *args
     wxIconBundle *arg1 = (wxIconBundle *) 0 ;
     wxString *arg2 = 0 ;
     long arg3 ;
     wxIconBundle *arg1 = (wxIconBundle *) 0 ;
     wxString *arg2 = 0 ;
     long arg3 ;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "file",(char *) "type", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "file",(char *) "type", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:IconBundle_AddIconFromFile",kwnames,&obj0,&obj1,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconBundle,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:IconBundle_AddIconFromFile",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIconBundle,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     }

+    arg3 = (long) SWIG_AsLong(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->AddIcon((wxString const &)*arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->AddIcon((wxString const &)*arg2,arg3);


@@ -3617,7 +4460,8 @@ static PyObject *_wrap_IconBundle_GetIcon(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconBundle_GetIcon",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconBundle_GetIcon",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconBundle,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIconBundle,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;


@@ -3632,7 +4476,10 @@ static PyObject *_wrap_IconBundle_GetIcon(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIcon, 0);
+    {
+        wxIcon* resultptr = new wxIcon(*result);
+        resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxIcon, 1);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3653,13 +4500,31 @@ static PyObject *_wrap_new_Cursor(PyObject *self, PyObject *args, PyObject *kwar
     int arg3 = (int) 0 ;
     int arg4 = (int) 0 ;
     wxCursor *result;
     int arg3 = (int) 0 ;
     int arg4 = (int) 0 ;
     wxCursor *result;

+    bool temp1 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "cursorName",(char *) "flags",(char *) "hotSpotX",(char *) "hotSpotY", NULL 
+        (char *) "cursorName",(char *) "type",(char *) "hotSpotX",(char *) "hotSpotY", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:new_Cursor",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_Cursor",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    {
+        arg1 = wxString_in_helper(obj0);
+        if (arg1 == NULL) SWIG_fail;
+        temp1 = True;
+    }
+    arg2 = (long) SWIG_AsLong(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxCursor *)new_wxCursor((wxString const *)arg1,arg2,arg3,arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxCursor *)new_wxCursor((wxString const *)arg1,arg2,arg3,arg4);


@@ -3667,9 +4532,17 @@ static PyObject *_wrap_new_Cursor(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCursor, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCursor, 1);
+    {
+        if (temp1)
+        delete arg1;
+    }

     return resultobj;
     fail:
     return resultobj;
     fail:

+    {
+        if (temp1)
+        delete arg1;
+    }

     return NULL;
 }
 
     return NULL;
 }
 


@@ -3683,7 +4556,8 @@ static PyObject *_wrap_delete_Cursor(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Cursor",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Cursor",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCursor,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -3702,11 +4576,14 @@ static PyObject *_wrap_new_StockCursor(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     int arg1 ;
     wxCursor *result;
     PyObject *resultobj;
     int arg1 ;
     wxCursor *result;

+    PyObject * obj0 = 0 ;

     char *kwnames[] = {
         (char *) "id", NULL 
     };
     
     char *kwnames[] = {
         (char *) "id", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:new_StockCursor",kwnames,&arg1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_StockCursor",kwnames,&obj0)) goto fail;
+    arg1 = (int) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxCursor *)new wxCursor(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxCursor *)new wxCursor(arg1);


@@ -3714,7 +4591,7 @@ static PyObject *_wrap_new_StockCursor(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCursor, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCursor, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3731,9 +4608,12 @@ static PyObject *_wrap_new_CursorFromImage(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_CursorFromImage",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_CursorFromImage",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -3742,41 +4622,7 @@ static PyObject *_wrap_new_CursorFromImage(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCursor, 1);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_new_CursorFromBits(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    PyObject *arg1 = (PyObject *) 0 ;
-    int arg2 ;
-    int arg3 ;
-    int arg4 = (int) -1 ;
-    int arg5 = (int) -1 ;
-    PyObject *arg6 = (PyObject *) 0 ;
-    wxCursor *result;
-    PyObject * obj0 = 0 ;
-    PyObject * obj5 = 0 ;
-    char *kwnames[] = {
-        (char *) "bits",(char *) "width",(char *) "height",(char *) "hotSpotX",(char *) "hotSpotY",(char *) "maskBits", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|iiO:new_CursorFromBits",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail;
-    arg1 = obj0;
-    if (obj5) {
-        arg6 = obj5;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCursor *)new_wxCursor(arg1,arg2,arg3,arg4,arg5,arg6);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCursor, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCursor, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3793,7 +4639,8 @@ static PyObject *_wrap_Cursor_Ok(PyObject *self, PyObject *args, PyObject *kwarg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Cursor_Ok",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Cursor_Ok",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCursor,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Ok();


@@ -3801,7 +4648,9 @@ static PyObject *_wrap_Cursor_Ok(PyObject *self, PyObject *args, PyObject *kwarg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3817,16 +4666,36 @@ static PyObject * Cursor_swigregister(PyObject *self, PyObject *args) {
 }
 static PyObject *_wrap_new_Region(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
 }
 static PyObject *_wrap_new_Region(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;

-    wxCoord arg1 = (wxCoord) 0 ;
-    wxCoord arg2 = (wxCoord) 0 ;
-    wxCoord arg3 = (wxCoord) 0 ;
-    wxCoord arg4 = (wxCoord) 0 ;
+    int arg1 = (int) 0 ;
+    int arg2 = (int) 0 ;
+    int arg3 = (int) 0 ;
+    int arg4 = (int) 0 ;

     wxRegion *result;
     wxRegion *result;

+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
         (char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
     char *kwnames[] = {
         (char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_Region",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_Region",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if (obj0) {
+        arg1 = (int) SWIG_AsInt(obj0); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxRegion *)new wxRegion(arg1,arg2,arg3,arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxRegion *)new wxRegion(arg1,arg2,arg3,arg4);


@@ -3834,7 +4703,7 @@ static PyObject *_wrap_new_Region(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRegion, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRegion, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3851,14 +4720,18 @@ static PyObject *_wrap_new_RegionFromBitmap(PyObject *self, PyObject *args, PyOb
     wxColour temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     wxColour temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL 
     };
     
     char *kwnames[] = {
         (char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|Oi:new_RegionFromBitmap",kwnames,&obj0,&obj1,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_RegionFromBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     if (obj1) {
         {
     }
     if (obj1) {
         {


@@ -3866,6 +4739,10 @@ static PyObject *_wrap_new_RegionFromBitmap(PyObject *self, PyObject *args, PyOb
             if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
         }
     }
             if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
         }
     }

+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxRegion *)new wxRegion((wxBitmap const &)*arg1,(wxColour const &)*arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxRegion *)new wxRegion((wxBitmap const &)*arg1,(wxColour const &)*arg2,arg3);


@@ -3873,7 +4750,7 @@ static PyObject *_wrap_new_RegionFromBitmap(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRegion, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRegion, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3887,15 +4764,20 @@ static PyObject *_wrap_new_RegionFromPoints(PyObject *self, PyObject *args, PyOb
     int arg3 = (int) wxWINDING_RULE ;
     wxRegion *result;
     PyObject * obj0 = 0 ;
     int arg3 = (int) wxWINDING_RULE ;
     wxRegion *result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "points",(char *) "fillStyle", NULL 
     };
     
     char *kwnames[] = {
         (char *) "points",(char *) "fillStyle", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_RegionFromPoints",kwnames,&obj0,&arg3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_RegionFromPoints",kwnames,&obj0,&obj1)) goto fail;

     {
         arg2 = wxPoint_LIST_helper(obj0, &arg1);
         if (arg2 == NULL) SWIG_fail;
     }
     {
         arg2 = wxPoint_LIST_helper(obj0, &arg1);
         if (arg2 == NULL) SWIG_fail;
     }

+    if (obj1) {
+        arg3 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxRegion *)new wxRegion(arg1,arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxRegion *)new wxRegion(arg1,arg2,arg3);


@@ -3903,7 +4785,7 @@ static PyObject *_wrap_new_RegionFromPoints(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRegion, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRegion, 1);

     {
         if (arg2) delete [] arg2;
     }
     {
         if (arg2) delete [] arg2;
     }


@@ -3925,7 +4807,8 @@ static PyObject *_wrap_delete_Region(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Region",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Region",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -3949,7 +4832,8 @@ static PyObject *_wrap_Region_Clear(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Region_Clear",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Region_Clear",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Clear();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Clear();


@@ -3967,16 +4851,23 @@ static PyObject *_wrap_Region_Clear(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_Region_Offset(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
 static PyObject *_wrap_Region_Offset(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;

     bool result;
     PyObject * obj0 = 0 ;
     bool result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Region_Offset",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Region_Offset",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Offset(arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Offset(arg2,arg3);


@@ -3984,7 +4875,9 @@ static PyObject *_wrap_Region_Offset(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -3994,16 +4887,23 @@ static PyObject *_wrap_Region_Offset(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_Region_Contains(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
 static PyObject *_wrap_Region_Contains(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;

     int result;
     PyObject * obj0 = 0 ;
     int result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Region_Contains",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Region_Contains",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->Contains(arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->Contains(arg2,arg3);


@@ -4011,7 +4911,7 @@ static PyObject *_wrap_Region_Contains(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4031,7 +4931,8 @@ static PyObject *_wrap_Region_ContainsPoint(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_ContainsPoint",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_ContainsPoint",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;


@@ -4043,7 +4944,7 @@ static PyObject *_wrap_Region_ContainsPoint(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4063,7 +4964,8 @@ static PyObject *_wrap_Region_ContainsRect(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_ContainsRect",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_ContainsRect",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;


@@ -4075,7 +4977,7 @@ static PyObject *_wrap_Region_ContainsRect(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4085,18 +4987,31 @@ static PyObject *_wrap_Region_ContainsRect(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_Region_ContainsRectDim(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
 static PyObject *_wrap_Region_ContainsRectDim(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;

     int result;
     PyObject * obj0 = 0 ;
     int result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_ContainsRectDim",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_ContainsRectDim",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->Contains(arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->Contains(arg2,arg3,arg4,arg5);


@@ -4104,7 +5019,7 @@ static PyObject *_wrap_Region_ContainsRectDim(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4121,7 +5036,8 @@ static PyObject *_wrap_Region_GetBox(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Region_GetBox",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Region_GetBox",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetBox();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetBox();


@@ -4132,7 +5048,7 @@ static PyObject *_wrap_Region_GetBox(PyObject *self, PyObject *args, PyObject *k
     {
         wxRect * resultptr;
         resultptr = new wxRect((wxRect &) result);
     {
         wxRect * resultptr;
         resultptr = new wxRect((wxRect &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRect, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -4143,18 +5059,31 @@ static PyObject *_wrap_Region_GetBox(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
 static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;

     bool result;
     PyObject * obj0 = 0 ;
     bool result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Intersect",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Intersect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Intersect(arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Intersect(arg2,arg3,arg4,arg5);


@@ -4162,7 +5091,9 @@ static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4182,7 +5113,8 @@ static PyObject *_wrap_Region_IntersectRect(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_IntersectRect",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_IntersectRect",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;


@@ -4194,7 +5126,9 @@ static PyObject *_wrap_Region_IntersectRect(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4213,10 +5147,14 @@ static PyObject *_wrap_Region_IntersectRegion(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_IntersectRegion",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_IntersectRegion",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -4225,7 +5163,9 @@ static PyObject *_wrap_Region_IntersectRegion(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4242,7 +5182,8 @@ static PyObject *_wrap_Region_IsEmpty(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Region_IsEmpty",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Region_IsEmpty",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->IsEmpty();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->IsEmpty();


@@ -4250,7 +5191,9 @@ static PyObject *_wrap_Region_IsEmpty(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4260,18 +5203,31 @@ static PyObject *_wrap_Region_IsEmpty(PyObject *self, PyObject *args, PyObject *
 static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
 static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;

     bool result;
     PyObject * obj0 = 0 ;
     bool result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Union",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Union",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Union(arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Union(arg2,arg3,arg4,arg5);


@@ -4279,7 +5235,9 @@ static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4299,7 +5257,8 @@ static PyObject *_wrap_Region_UnionRect(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_UnionRect",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_UnionRect",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;


@@ -4311,7 +5270,9 @@ static PyObject *_wrap_Region_UnionRect(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4330,10 +5291,14 @@ static PyObject *_wrap_Region_UnionRegion(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_UnionRegion",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_UnionRegion",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -4342,7 +5307,9 @@ static PyObject *_wrap_Region_UnionRegion(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4352,18 +5319,31 @@ static PyObject *_wrap_Region_UnionRegion(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
 static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;

     bool result;
     PyObject * obj0 = 0 ;
     bool result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Subtract",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Subtract",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Subtract(arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Subtract(arg2,arg3,arg4,arg5);


@@ -4371,7 +5351,9 @@ static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4391,7 +5373,8 @@ static PyObject *_wrap_Region_SubtractRect(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_SubtractRect",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_SubtractRect",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;


@@ -4403,7 +5386,9 @@ static PyObject *_wrap_Region_SubtractRect(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4422,10 +5407,14 @@ static PyObject *_wrap_Region_SubtractRegion(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_SubtractRegion",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_SubtractRegion",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -4434,7 +5423,9 @@ static PyObject *_wrap_Region_SubtractRegion(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4444,18 +5435,31 @@ static PyObject *_wrap_Region_SubtractRegion(PyObject *self, PyObject *args, PyO
 static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
 static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;

     bool result;
     PyObject * obj0 = 0 ;
     bool result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Xor",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Xor",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Xor(arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Xor(arg2,arg3,arg4,arg5);


@@ -4463,7 +5467,9 @@ static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4483,7 +5489,8 @@ static PyObject *_wrap_Region_XorRect(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_XorRect",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_XorRect",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;


@@ -4495,7 +5502,9 @@ static PyObject *_wrap_Region_XorRect(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4514,10 +5523,14 @@ static PyObject *_wrap_Region_XorRegion(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_XorRegion",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_XorRegion",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -4526,7 +5539,9 @@ static PyObject *_wrap_Region_XorRegion(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4543,7 +5558,8 @@ static PyObject *_wrap_Region_ConvertToBitmap(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Region_ConvertToBitmap",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Region_ConvertToBitmap",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->ConvertToBitmap();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->ConvertToBitmap();


@@ -4554,7 +5570,7 @@ static PyObject *_wrap_Region_ConvertToBitmap(PyObject *self, PyObject *args, Py
     {
         wxBitmap * resultptr;
         resultptr = new wxBitmap((wxBitmap &) result);
     {
         wxBitmap * resultptr;
         resultptr = new wxBitmap((wxBitmap &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxBitmap, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxBitmap, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -4574,15 +5590,20 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;

+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|Oi:Region_UnionBitmap",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Region_UnionBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     if (obj2) {
         {
     }
     if (obj2) {
         {


@@ -4590,6 +5611,10 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje
             if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
         }
     }
             if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
         }
     }

+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Union((wxBitmap const &)*arg2,(wxColour const &)*arg3,arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Union((wxBitmap const &)*arg2,(wxColour const &)*arg3,arg4);


@@ -4597,7 +5622,9 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4621,9 +5648,12 @@ static PyObject *_wrap_new_RegionIterator(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_RegionIterator",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_RegionIterator",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -4632,7 +5662,7 @@ static PyObject *_wrap_new_RegionIterator(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRegionIterator, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRegionIterator, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4648,7 +5678,8 @@ static PyObject *_wrap_delete_RegionIterator(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_RegionIterator",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_RegionIterator",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegionIterator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -4666,22 +5697,23 @@ static PyObject *_wrap_delete_RegionIterator(PyObject *self, PyObject *args, PyO
 static PyObject *_wrap_RegionIterator_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
 static PyObject *_wrap_RegionIterator_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;

-    wxCoord result;
+    int result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetX",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetX",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegionIterator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)(arg1)->GetX();
+        result = (int)(arg1)->GetX();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4691,22 +5723,23 @@ static PyObject *_wrap_RegionIterator_GetX(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_RegionIterator_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
 static PyObject *_wrap_RegionIterator_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;

-    wxCoord result;
+    int result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetY",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetY",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegionIterator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)(arg1)->GetY();
+        result = (int)(arg1)->GetY();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4716,22 +5749,23 @@ static PyObject *_wrap_RegionIterator_GetY(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_RegionIterator_GetW(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
 static PyObject *_wrap_RegionIterator_GetW(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;

-    wxCoord result;
+    int result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetW",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetW",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegionIterator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)(arg1)->GetW();
+        result = (int)(arg1)->GetW();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4741,22 +5775,23 @@ static PyObject *_wrap_RegionIterator_GetW(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_RegionIterator_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
 static PyObject *_wrap_RegionIterator_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;

-    wxCoord result;
+    int result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetWidth",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetWidth",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegionIterator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)(arg1)->GetWidth();
+        result = (int)(arg1)->GetWidth();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4766,22 +5801,23 @@ static PyObject *_wrap_RegionIterator_GetWidth(PyObject *self, PyObject *args, P
 static PyObject *_wrap_RegionIterator_GetH(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
 static PyObject *_wrap_RegionIterator_GetH(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;

-    wxCoord result;
+    int result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetH",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetH",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegionIterator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)(arg1)->GetH();
+        result = (int)(arg1)->GetH();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4791,22 +5827,23 @@ static PyObject *_wrap_RegionIterator_GetH(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_RegionIterator_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
 static PyObject *_wrap_RegionIterator_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;

-    wxCoord result;
+    int result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetHeight",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetHeight",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegionIterator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)(arg1)->GetHeight();
+        result = (int)(arg1)->GetHeight();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4823,7 +5860,8 @@ static PyObject *_wrap_RegionIterator_GetRect(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetRect",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_GetRect",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegionIterator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetRect();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetRect();


@@ -4834,7 +5872,7 @@ static PyObject *_wrap_RegionIterator_GetRect(PyObject *self, PyObject *args, Py
     {
         wxRect * resultptr;
         resultptr = new wxRect((wxRect &) result);
     {
         wxRect * resultptr;
         resultptr = new wxRect((wxRect &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRect, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -4852,7 +5890,8 @@ static PyObject *_wrap_RegionIterator_HaveRects(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_HaveRects",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_HaveRects",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegionIterator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->HaveRects();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->HaveRects();


@@ -4860,7 +5899,9 @@ static PyObject *_wrap_RegionIterator_HaveRects(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4876,7 +5917,8 @@ static PyObject *_wrap_RegionIterator_Reset(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_Reset",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_Reset",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegionIterator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Reset();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Reset();


@@ -4900,7 +5942,8 @@ static PyObject *_wrap_RegionIterator_Next(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_Next",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator_Next",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegionIterator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxRegionIterator_Next(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxRegionIterator_Next(arg1);


@@ -4925,7 +5968,8 @@ static PyObject *_wrap_RegionIterator___nonzero__(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator___nonzero__",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegionIterator___nonzero__",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegionIterator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)wxRegionIterator___nonzero__(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)wxRegionIterator___nonzero__(arg1);


@@ -4933,7 +5977,9 @@ static PyObject *_wrap_RegionIterator___nonzero__(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4962,7 +6008,7 @@ static PyObject *_wrap_new_NativeFontInfo(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxNativeFontInfo, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNativeFontInfo, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -4978,7 +6024,8 @@ static PyObject *_wrap_delete_NativeFontInfo(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_NativeFontInfo",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_NativeFontInfo",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -5002,7 +6049,8 @@ static PyObject *_wrap_NativeFontInfo_Init(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_Init",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_Init",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Init();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Init();


@@ -5028,10 +6076,14 @@ static PyObject *_wrap_NativeFontInfo_InitFromFont(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_InitFromFont",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_InitFromFont",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -5057,7 +6109,8 @@ static PyObject *_wrap_NativeFontInfo_GetPointSize(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetPointSize",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetPointSize",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxNativeFontInfo const *)arg1)->GetPointSize();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxNativeFontInfo const *)arg1)->GetPointSize();


@@ -5065,7 +6118,7 @@ static PyObject *_wrap_NativeFontInfo_GetPointSize(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -5082,7 +6135,8 @@ static PyObject *_wrap_NativeFontInfo_GetStyle(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetStyle",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetStyle",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxNativeFontInfo const *)arg1)->GetStyle();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxNativeFontInfo const *)arg1)->GetStyle();


@@ -5090,7 +6144,7 @@ static PyObject *_wrap_NativeFontInfo_GetStyle(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -5107,7 +6161,8 @@ static PyObject *_wrap_NativeFontInfo_GetWeight(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetWeight",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetWeight",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxNativeFontInfo const *)arg1)->GetWeight();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxNativeFontInfo const *)arg1)->GetWeight();


@@ -5115,7 +6170,7 @@ static PyObject *_wrap_NativeFontInfo_GetWeight(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -5132,7 +6187,8 @@ static PyObject *_wrap_NativeFontInfo_GetUnderlined(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetUnderlined",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetUnderlined",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxNativeFontInfo const *)arg1)->GetUnderlined();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxNativeFontInfo const *)arg1)->GetUnderlined();


@@ -5140,7 +6196,9 @@ static PyObject *_wrap_NativeFontInfo_GetUnderlined(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -5157,7 +6215,8 @@ static PyObject *_wrap_NativeFontInfo_GetFaceName(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetFaceName",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetFaceName",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxNativeFontInfo const *)arg1)->GetFaceName();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxNativeFontInfo const *)arg1)->GetFaceName();


@@ -5188,7 +6247,8 @@ static PyObject *_wrap_NativeFontInfo_GetFamily(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetFamily",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetFamily",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxNativeFontInfo const *)arg1)->GetFamily();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxNativeFontInfo const *)arg1)->GetFamily();


@@ -5196,7 +6256,7 @@ static PyObject *_wrap_NativeFontInfo_GetFamily(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -5213,7 +6273,8 @@ static PyObject *_wrap_NativeFontInfo_GetEncoding(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetEncoding",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetEncoding",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxNativeFontInfo const *)arg1)->GetEncoding();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxNativeFontInfo const *)arg1)->GetEncoding();


@@ -5221,7 +6282,7 @@ static PyObject *_wrap_NativeFontInfo_GetEncoding(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -5233,12 +6294,16 @@ static PyObject *_wrap_NativeFontInfo_SetPointSize(PyObject *self, PyObject *arg
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "pointsize", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "pointsize", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetPointSize",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetPointSize",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetPointSize(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetPointSize(arg2);


@@ -5258,12 +6323,16 @@ static PyObject *_wrap_NativeFontInfo_SetStyle(PyObject *self, PyObject *args, P
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "style", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "style", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetStyle",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetStyle",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (wxFontStyle) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetStyle((wxFontStyle )arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetStyle((wxFontStyle )arg2);


@@ -5283,12 +6352,16 @@ static PyObject *_wrap_NativeFontInfo_SetWeight(PyObject *self, PyObject *args,
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "weight", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "weight", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetWeight",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetWeight",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (wxFontWeight) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetWeight((wxFontWeight )arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetWeight((wxFontWeight )arg2);


@@ -5314,8 +6387,9 @@ static PyObject *_wrap_NativeFontInfo_SetUnderlined(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetUnderlined",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetUnderlined",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -5335,7 +6409,6 @@ static PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *self, PyObject *args
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString arg2 ;
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString arg2 ;

-    wxString *argp2 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -5343,9 +6416,14 @@ static PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetFaceName",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetFaceName",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        wxString* sptr = wxString_in_helper(obj1);
+        if (sptr == NULL) SWIG_fail;
+        arg2 = *sptr;
+        delete sptr;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetFaceName(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetFaceName(arg2);


@@ -5365,12 +6443,16 @@ static PyObject *_wrap_NativeFontInfo_SetFamily(PyObject *self, PyObject *args,
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "family", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "family", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetFamily",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetFamily",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (wxFontFamily) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetFamily((wxFontFamily )arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetFamily((wxFontFamily )arg2);


@@ -5390,12 +6472,16 @@ static PyObject *_wrap_NativeFontInfo_SetEncoding(PyObject *self, PyObject *args
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "encoding", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "encoding", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetEncoding",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetEncoding",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (wxFontEncoding) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetEncoding((wxFontEncoding )arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetEncoding((wxFontEncoding )arg2);


@@ -5415,7 +6501,7 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args,
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString *arg2 = 0 ;
     bool result;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -5423,11 +6509,12 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_FromString",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_FromString",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -5436,7 +6523,9 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp2)
         delete arg2;
     {
         if (temp2)
         delete arg2;


@@ -5461,7 +6550,8 @@ static PyObject *_wrap_NativeFontInfo_ToString(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_ToString",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_ToString",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxNativeFontInfo const *)arg1)->ToString();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxNativeFontInfo const *)arg1)->ToString();


@@ -5492,7 +6582,8 @@ static PyObject *_wrap_NativeFontInfo___str__(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo___str__",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo___str__",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxNativeFontInfo___str__(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxNativeFontInfo___str__(arg1);


@@ -5518,7 +6609,7 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *a
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString *arg2 = 0 ;
     bool result;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -5526,11 +6617,12 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_FromUserString",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_FromUserString",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -5539,7 +6631,9 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp2)
         delete arg2;
     {
         if (temp2)
         delete arg2;


@@ -5564,7 +6658,8 @@ static PyObject *_wrap_NativeFontInfo_ToUserString(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_ToUserString",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_ToUserString",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxNativeFontInfo const *)arg1)->ToUserString();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxNativeFontInfo const *)arg1)->ToUserString();


@@ -5595,8 +6690,8 @@ static PyObject * NativeFontInfo_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
 static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;

-    wxString arg2 ;
-    wxString *argp2 ;
+    wxString *arg2 = (wxString *) 0 ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -5604,14 +6699,26 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_facename_set",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_facename_set",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
-    if (arg1) (arg1)->facename = arg2;
-    
-    Py_INCREF(Py_None); resultobj = Py_None;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeEncodingInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        arg2 = wxString_in_helper(obj1);
+        if (arg2 == NULL) SWIG_fail;
+        temp2 = True;
+    }
+    if (arg1) (arg1)->facename = *arg2;
+    
+    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        if (temp2)
+        delete arg2;
+    }

     return resultobj;
     fail:
     return resultobj;
     fail:

+    {
+        if (temp2)
+        delete arg2;
+    }

     return NULL;
 }
 
     return NULL;
 }
 


@@ -5619,21 +6726,22 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject
 static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
 static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;

-    wxString result;
+    wxString *result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeEncodingInfo_facename_get",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeEncodingInfo_facename_get",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    result =  ((arg1)->facename);
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeEncodingInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    result = (wxString *)& ((arg1)->facename);

     
     {
 #if wxUSE_UNICODE
     
     {
 #if wxUSE_UNICODE

-        resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+        resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());

 #else
 #else

-        resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+        resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());

 #endif
     }
     return resultobj;
 #endif
     }
     return resultobj;


@@ -5647,12 +6755,16 @@ static PyObject *_wrap_NativeEncodingInfo_encoding_set(PyObject *self, PyObject
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "encoding", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "encoding", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeEncodingInfo_encoding_set",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_encoding_set",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeEncodingInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (wxFontEncoding) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     if (arg1) (arg1)->encoding = (wxFontEncoding )arg2;
     
     Py_INCREF(Py_None); resultobj = Py_None;
     if (arg1) (arg1)->encoding = (wxFontEncoding )arg2;
     
     Py_INCREF(Py_None); resultobj = Py_None;


@@ -5672,10 +6784,11 @@ static PyObject *_wrap_NativeEncodingInfo_encoding_get(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeEncodingInfo_encoding_get",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeEncodingInfo_encoding_get",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeEncodingInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     result = (int) ((arg1)->encoding);
     
     result = (int) ((arg1)->encoding);
     

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -5697,7 +6810,7 @@ static PyObject *_wrap_new_NativeEncodingInfo(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxNativeEncodingInfo, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNativeEncodingInfo, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -5713,7 +6826,8 @@ static PyObject *_wrap_delete_NativeEncodingInfo(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_NativeEncodingInfo",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_NativeEncodingInfo",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeEncodingInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -5733,7 +6847,7 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *a
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
     wxString *arg2 = 0 ;
     bool result;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -5741,11 +6855,12 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_FromString",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_FromString",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeEncodingInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -5754,7 +6869,9 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp2)
         delete arg2;
     {
         if (temp2)
         delete arg2;


@@ -5779,7 +6896,8 @@ static PyObject *_wrap_NativeEncodingInfo_ToString(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeEncodingInfo_ToString",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeEncodingInfo_ToString",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeEncodingInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxNativeEncodingInfo const *)arg1)->ToString();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxNativeEncodingInfo const *)arg1)->ToString();


@@ -5811,11 +6929,14 @@ static PyObject *_wrap_GetNativeFontEncoding(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     int arg1 ;
     wxNativeEncodingInfo *result;
     PyObject *resultobj;
     int arg1 ;
     wxNativeEncodingInfo *result;

+    PyObject * obj0 = 0 ;

     char *kwnames[] = {
         (char *) "encoding", NULL 
     };
     
     char *kwnames[] = {
         (char *) "encoding", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:GetNativeFontEncoding",kwnames,&arg1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetNativeFontEncoding",kwnames,&obj0)) goto fail;
+    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxNativeEncodingInfo *)wxGetNativeFontEncoding((wxFontEncoding )arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxNativeEncodingInfo *)wxGetNativeFontEncoding((wxFontEncoding )arg1);


@@ -5823,7 +6944,7 @@ static PyObject *_wrap_GetNativeFontEncoding(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxNativeEncodingInfo, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNativeEncodingInfo, 0);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -5840,9 +6961,12 @@ static PyObject *_wrap_TestFontEncoding(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TestFontEncoding",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TestFontEncoding",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeEncodingInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -5851,7 +6975,9 @@ static PyObject *_wrap_TestFontEncoding(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -5873,7 +6999,7 @@ static PyObject *_wrap_new_FontMapper(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFontMapper, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFontMapper, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -5889,7 +7015,8 @@ static PyObject *_wrap_delete_FontMapper(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_FontMapper",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_FontMapper",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontMapper,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -5919,7 +7046,7 @@ static PyObject *_wrap_FontMapper_Get(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFontMapper, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFontMapper, 0);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -5936,7 +7063,8 @@ static PyObject *_wrap_FontMapper_Set(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_Set",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_Set",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontMapper,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxFontMapper *)wxFontMapper::Set(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxFontMapper *)wxFontMapper::Set(arg1);


@@ -5944,7 +7072,7 @@ static PyObject *_wrap_FontMapper_Set(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFontMapper, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFontMapper, 0);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -5955,9 +7083,9 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxString *arg2 = 0 ;
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxString *arg2 = 0 ;

-    bool arg3 = (bool) true ;
+    bool arg3 = (bool) True ;

     int result;
     int result;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;


@@ -5966,14 +7094,15 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FontMapper_CharsetToEncoding",kwnames,&obj0,&obj1,&obj2)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FontMapper_CharsetToEncoding",kwnames,&obj0,&obj1,&obj2)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontMapper,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     if (obj2) {
     }
     if (obj2) {

-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -5983,7 +7112,7 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     {
         if (temp2)
         delete arg2;
     {
         if (temp2)
         delete arg2;


@@ -6013,7 +7142,7 @@ static PyObject *_wrap_FontMapper_GetSupportedEncodingsCount(PyObject *self, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromUnsignedLong((unsigned long)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6030,7 +7159,7 @@ static PyObject *_wrap_FontMapper_GetEncoding(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncoding",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncoding",kwnames,&obj0)) goto fail;

-    arg1 = (size_t) PyInt_AsLong(obj0);
+    arg1 = (size_t) SWIG_AsUnsignedLong(obj0); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -6039,7 +7168,7 @@ static PyObject *_wrap_FontMapper_GetEncoding(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6050,11 +7179,14 @@ static PyObject *_wrap_FontMapper_GetEncodingName(PyObject *self, PyObject *args
     PyObject *resultobj;
     int arg1 ;
     wxString result;
     PyObject *resultobj;
     int arg1 ;
     wxString result;

+    PyObject * obj0 = 0 ;

     char *kwnames[] = {
         (char *) "encoding", NULL 
     };
     
     char *kwnames[] = {
         (char *) "encoding", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:FontMapper_GetEncodingName",kwnames,&arg1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingName",kwnames,&obj0)) goto fail;
+    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxFontMapper::GetEncodingName((wxFontEncoding )arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxFontMapper::GetEncodingName((wxFontEncoding )arg1);


@@ -6079,11 +7211,14 @@ static PyObject *_wrap_FontMapper_GetEncodingDescription(PyObject *self, PyObjec
     PyObject *resultobj;
     int arg1 ;
     wxString result;
     PyObject *resultobj;
     int arg1 ;
     wxString result;

+    PyObject * obj0 = 0 ;

     char *kwnames[] = {
         (char *) "encoding", NULL 
     };
     
     char *kwnames[] = {
         (char *) "encoding", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:FontMapper_GetEncodingDescription",kwnames,&arg1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingDescription",kwnames,&obj0)) goto fail;
+    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxFontMapper::GetEncodingDescription((wxFontEncoding )arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxFontMapper::GetEncodingDescription((wxFontEncoding )arg1);


@@ -6115,8 +7250,10 @@ static PyObject *_wrap_FontMapper_SetConfig(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetConfig",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetConfig",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontMapper,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxConfigBase,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetConfig(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetConfig(arg2);


@@ -6135,7 +7272,7 @@ static PyObject *_wrap_FontMapper_SetConfigPath(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxString *arg2 = 0 ;
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxString *arg2 = 0 ;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -6143,11 +7280,12 @@ static PyObject *_wrap_FontMapper_SetConfigPath(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetConfigPath",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetConfigPath",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontMapper,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -6205,27 +7343,31 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *self, PyObject *ar
     int arg2 ;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     int arg2 ;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;

-    bool arg4 = (bool) TRUE ;
+    bool arg4 = (bool) True ;

     PyObject *result;
     PyObject *result;

-    bool temp3 = false ;
+    bool temp3 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "encoding",(char *) "facename",(char *) "interactive", NULL 
     };
     
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "encoding",(char *) "facename",(char *) "interactive", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OO:FontMapper_GetAltForEncoding",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:FontMapper_GetAltForEncoding",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontMapper,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (wxFontEncoding) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;

-            temp3 = true;
+            temp3 = True;

         }
     }
     if (obj3) {
         }
     }
     if (obj3) {

-        arg4 = PyInt_AsLong(obj3) ? true : false;
+        arg4 = (bool) SWIG_AsBool(obj3); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -6257,20 +7399,24 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject *
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     bool result;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     bool result;

-    bool temp3 = false ;
+    bool temp3 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     PyObject * obj2 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "encoding",(char *) "facename", NULL 
     };
     
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "encoding",(char *) "facename", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:FontMapper_IsEncodingAvailable",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FontMapper_IsEncodingAvailable",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontMapper,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (wxFontEncoding) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;

-            temp3 = true;
+            temp3 = True;

         }
     }
     {
         }
     }
     {


@@ -6280,7 +7426,9 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp3)
         delete arg3;
     {
         if (temp3)
         delete arg3;


@@ -6306,8 +7454,10 @@ static PyObject *_wrap_FontMapper_SetDialogParent(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetDialogParent",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetDialogParent",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontMapper,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetDialogParent(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetDialogParent(arg2);


@@ -6326,7 +7476,7 @@ static PyObject *_wrap_FontMapper_SetDialogTitle(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxString *arg2 = 0 ;
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxString *arg2 = 0 ;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -6334,11 +7484,12 @@ static PyObject *_wrap_FontMapper_SetDialogTitle(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetDialogTitle",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetDialogTitle",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontMapper,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -6375,30 +7526,47 @@ static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs
     int arg2 ;
     int arg3 ;
     int arg4 ;
     int arg2 ;
     int arg3 ;
     int arg4 ;

-    bool arg5 = (bool) FALSE ;
+    bool arg5 = (bool) False ;

     wxString const &arg6_defvalue = wxPyEmptyString ;
     wxString *arg6 = (wxString *) &arg6_defvalue ;
     int arg7 = (int) wxFONTENCODING_DEFAULT ;
     wxFont *result;
     wxString const &arg6_defvalue = wxPyEmptyString ;
     wxString *arg6 = (wxString *) &arg6_defvalue ;
     int arg7 = (int) wxFONTENCODING_DEFAULT ;
     wxFont *result;

-    bool temp6 = false ;
+    bool temp6 = False ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     PyObject * obj4 = 0 ;
     PyObject * obj5 = 0 ;
     PyObject * obj4 = 0 ;
     PyObject * obj5 = 0 ;

+    PyObject * obj6 = 0 ;

     char *kwnames[] = {
         (char *) "pointSize",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "face",(char *) "encoding", NULL 
     };
     
     char *kwnames[] = {
         (char *) "pointSize",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "face",(char *) "encoding", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiii|OOi:new_Font",kwnames,&arg1,&arg2,&arg3,&arg4,&obj4,&obj5,&arg7)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:new_Font",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    arg1 = (int) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;

     if (obj4) {
     if (obj4) {

-        arg5 = PyInt_AsLong(obj4) ? true : false;
+        arg5 = (bool) SWIG_AsBool(obj4); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;

-            temp6 = true;
+            temp6 = True;

         }
     }
         }
     }

+    if (obj6) {
+        arg7 = (wxFontEncoding) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxFont *)new wxFont(arg1,arg2,arg3,arg4,arg5,(wxString const &)*arg6,(wxFontEncoding )arg7);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxFont *)new wxFont(arg1,arg2,arg3,arg4,arg5,(wxString const &)*arg6,(wxFontEncoding )arg7);


@@ -6406,7 +7574,7 @@ static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 1);

     {
         if (temp6)
         delete arg6;
     {
         if (temp6)
         delete arg6;


@@ -6430,7 +7598,8 @@ static PyObject *_wrap_delete_Font(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Font",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Font",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -6455,9 +7624,12 @@ static PyObject *_wrap_new_FontFromNativeInfo(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_FontFromNativeInfo",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_FontFromNativeInfo",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -6466,7 +7638,7 @@ static PyObject *_wrap_new_FontFromNativeInfo(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6477,7 +7649,7 @@ static PyObject *_wrap_new_FontFromNativeInfoString(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxFont *result;
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxFont *result;

-    bool temp1 = false ;
+    bool temp1 = False ;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "info", NULL 
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "info", NULL 


@@ -6487,7 +7659,7 @@ static PyObject *_wrap_new_FontFromNativeInfoString(PyObject *self, PyObject *ar
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;

-        temp1 = true;
+        temp1 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -6496,7 +7668,7 @@ static PyObject *_wrap_new_FontFromNativeInfoString(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 1);

     {
         if (temp1)
         delete arg1;
     {
         if (temp1)
         delete arg1;


@@ -6520,20 +7692,36 @@ static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwarg
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     int arg5 = (int) wxFONTENCODING_DEFAULT ;
     wxFont *result;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     int arg5 = (int) wxFONTENCODING_DEFAULT ;
     wxFont *result;

-    bool temp4 = false ;
+    bool temp4 = False ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     PyObject * obj3 = 0 ;
     PyObject * obj3 = 0 ;

+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "pointSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL 
     };
     
     char *kwnames[] = {
         (char *) "pointSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii|iOi:new_Font2",kwnames,&arg1,&arg2,&arg3,&obj3,&arg5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_Font2",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    arg1 = (int) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg2 = (wxFontFamily) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;

-            temp4 = true;
+            temp4 = True;

         }
     }
         }
     }

+    if (obj4) {
+        arg5 = (wxFontEncoding) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxFont *)new_wxFont(arg1,(wxFontFamily )arg2,arg3,(wxString const &)*arg4,(wxFontEncoding )arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxFont *)new_wxFont(arg1,(wxFontFamily )arg2,arg3,(wxString const &)*arg4,(wxFontEncoding )arg5);


@@ -6541,7 +7729,7 @@ static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwarg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 1);

     {
         if (temp4)
         delete arg4;
     {
         if (temp4)
         delete arg4;


@@ -6566,7 +7754,8 @@ static PyObject *_wrap_Font_Ok(PyObject *self, PyObject *args, PyObject *kwargs)
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_Ok",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_Ok",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxFont const *)arg1)->Ok();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxFont const *)arg1)->Ok();


@@ -6574,7 +7763,9 @@ static PyObject *_wrap_Font_Ok(PyObject *self, PyObject *args, PyObject *kwargs)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6584,28 +7775,29 @@ static PyObject *_wrap_Font_Ok(PyObject *self, PyObject *args, PyObject *kwargs)
 static PyObject *_wrap_Font___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
 static PyObject *_wrap_Font___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;

-    wxFont *arg2 = 0 ;
+    wxFont *arg2 = (wxFont *) 0 ;

     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {

-        (char *) "self",(char *) "font", NULL 
+        (char *) "self",(char *) "other", NULL 

     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font___eq__",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font___eq__",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)((wxFont const *)arg1)->operator ==((wxFont const &)*arg2);
+        result = (bool)wxFont___eq__(arg1,(wxFont const *)arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6615,28 +7807,29 @@ static PyObject *_wrap_Font___eq__(PyObject *self, PyObject *args, PyObject *kwa
 static PyObject *_wrap_Font___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
 static PyObject *_wrap_Font___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;

-    wxFont *arg2 = 0 ;
+    wxFont *arg2 = (wxFont *) 0 ;

     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {

-        (char *) "self",(char *) "font", NULL 
+        (char *) "self",(char *) "other", NULL 

     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font___ne__",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font___ne__",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)((wxFont const *)arg1)->operator !=((wxFont const &)*arg2);
+        result = (bool)wxFont___ne__(arg1,(wxFont const *)arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6653,7 +7846,8 @@ static PyObject *_wrap_Font_GetPointSize(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetPointSize",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetPointSize",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxFont const *)arg1)->GetPointSize();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxFont const *)arg1)->GetPointSize();


@@ -6661,7 +7855,7 @@ static PyObject *_wrap_Font_GetPointSize(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6678,7 +7872,8 @@ static PyObject *_wrap_Font_GetFamily(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetFamily",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetFamily",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxFont const *)arg1)->GetFamily();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxFont const *)arg1)->GetFamily();


@@ -6686,7 +7881,7 @@ static PyObject *_wrap_Font_GetFamily(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6703,7 +7898,8 @@ static PyObject *_wrap_Font_GetStyle(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetStyle",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetStyle",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxFont const *)arg1)->GetStyle();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxFont const *)arg1)->GetStyle();


@@ -6711,7 +7907,7 @@ static PyObject *_wrap_Font_GetStyle(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6728,7 +7924,8 @@ static PyObject *_wrap_Font_GetWeight(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetWeight",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetWeight",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxFont const *)arg1)->GetWeight();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxFont const *)arg1)->GetWeight();


@@ -6736,7 +7933,7 @@ static PyObject *_wrap_Font_GetWeight(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6753,7 +7950,8 @@ static PyObject *_wrap_Font_GetUnderlined(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetUnderlined",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetUnderlined",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxFont const *)arg1)->GetUnderlined();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxFont const *)arg1)->GetUnderlined();


@@ -6761,7 +7959,9 @@ static PyObject *_wrap_Font_GetUnderlined(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6778,7 +7978,8 @@ static PyObject *_wrap_Font_GetFaceName(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetFaceName",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetFaceName",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxFont const *)arg1)->GetFaceName();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxFont const *)arg1)->GetFaceName();


@@ -6809,7 +8010,8 @@ static PyObject *_wrap_Font_GetEncoding(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetEncoding",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetEncoding",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxFont const *)arg1)->GetEncoding();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxFont const *)arg1)->GetEncoding();


@@ -6817,7 +8019,7 @@ static PyObject *_wrap_Font_GetEncoding(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6834,7 +8036,8 @@ static PyObject *_wrap_Font_GetNativeFontInfo(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetNativeFontInfo",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetNativeFontInfo",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxNativeFontInfo *)((wxFont const *)arg1)->GetNativeFontInfo();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxNativeFontInfo *)((wxFont const *)arg1)->GetNativeFontInfo();


@@ -6842,7 +8045,7 @@ static PyObject *_wrap_Font_GetNativeFontInfo(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxNativeFontInfo, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNativeFontInfo, 0);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6859,7 +8062,8 @@ static PyObject *_wrap_Font_IsFixedWidth(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_IsFixedWidth",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_IsFixedWidth",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxFont const *)arg1)->IsFixedWidth();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxFont const *)arg1)->IsFixedWidth();


@@ -6867,7 +8071,9 @@ static PyObject *_wrap_Font_IsFixedWidth(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -6884,7 +8090,8 @@ static PyObject *_wrap_Font_GetNativeFontInfoDesc(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetNativeFontInfoDesc",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetNativeFontInfoDesc",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxFont const *)arg1)->GetNativeFontInfoDesc();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxFont const *)arg1)->GetNativeFontInfoDesc();


@@ -6915,7 +8122,8 @@ static PyObject *_wrap_Font_GetNativeFontInfoUserDesc(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetNativeFontInfoUserDesc",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetNativeFontInfoUserDesc",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxFont const *)arg1)->GetNativeFontInfoUserDesc();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxFont const *)arg1)->GetNativeFontInfoUserDesc();


@@ -6941,12 +8149,16 @@ static PyObject *_wrap_Font_SetPointSize(PyObject *self, PyObject *args, PyObjec
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "pointSize", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "pointSize", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetPointSize",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetPointSize",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetPointSize(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetPointSize(arg2);


@@ -6966,12 +8178,16 @@ static PyObject *_wrap_Font_SetFamily(PyObject *self, PyObject *args, PyObject *
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "family", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "family", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetFamily",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetFamily",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetFamily(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetFamily(arg2);


@@ -6991,12 +8207,16 @@ static PyObject *_wrap_Font_SetStyle(PyObject *self, PyObject *args, PyObject *k
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "style", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "style", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetStyle",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetStyle",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetStyle(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetStyle(arg2);


@@ -7016,12 +8236,16 @@ static PyObject *_wrap_Font_SetWeight(PyObject *self, PyObject *args, PyObject *
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "weight", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "weight", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetWeight",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetWeight",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetWeight(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetWeight(arg2);


@@ -7040,7 +8264,7 @@ static PyObject *_wrap_Font_SetFaceName(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString *arg2 = 0 ;
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString *arg2 = 0 ;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -7048,11 +8272,12 @@ static PyObject *_wrap_Font_SetFaceName(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetFaceName",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetFaceName",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -7087,8 +8312,9 @@ static PyObject *_wrap_Font_SetUnderlined(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetUnderlined",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetUnderlined",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -7109,12 +8335,16 @@ static PyObject *_wrap_Font_SetEncoding(PyObject *self, PyObject *args, PyObject
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "encoding", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "encoding", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetEncoding",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetEncoding",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (wxFontEncoding) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetEncoding((wxFontEncoding )arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetEncoding((wxFontEncoding )arg2);


@@ -7140,10 +8370,14 @@ static PyObject *_wrap_Font_SetNativeFontInfo(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetNativeFontInfo",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetNativeFontInfo",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxNativeFontInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -7163,7 +8397,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *self, PyObject
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString *arg2 = 0 ;
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString *arg2 = 0 ;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -7171,11 +8405,12 @@ static PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetNativeFontInfoFromString",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetNativeFontInfoFromString",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -7203,7 +8438,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *self, PyObject *
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString *arg2 = 0 ;
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString *arg2 = 0 ;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -7211,11 +8446,12 @@ static PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetNativeFontInfoUserDesc",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetNativeFontInfoUserDesc",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -7249,7 +8485,8 @@ static PyObject *_wrap_Font_GetFamilyString(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetFamilyString",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetFamilyString",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxFont const *)arg1)->GetFamilyString();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxFont const *)arg1)->GetFamilyString();


@@ -7280,7 +8517,8 @@ static PyObject *_wrap_Font_GetStyleString(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetStyleString",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetStyleString",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxFont const *)arg1)->GetStyleString();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxFont const *)arg1)->GetStyleString();


@@ -7311,7 +8549,8 @@ static PyObject *_wrap_Font_GetWeightString(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetWeightString",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetWeightString",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxFont const *)arg1)->GetWeightString();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxFont const *)arg1)->GetWeightString();


@@ -7335,7 +8574,7 @@ static PyObject *_wrap_Font_GetWeightString(PyObject *self, PyObject *args, PyOb
 static PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
 static PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;

-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -7343,9 +8582,10 @@ static PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Font_SetNoAntiAliasing",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Font_SetNoAntiAliasing",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     if (obj1) {
     if (obj1) {

-        arg2 = PyInt_AsLong(obj1) ? true : false;
+        arg2 = (bool) SWIG_AsBool(obj1); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -7372,7 +8612,8 @@ static PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetNoAntiAliasing",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetNoAntiAliasing",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetNoAntiAliasing();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetNoAntiAliasing();


@@ -7380,7 +8621,9 @@ static PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -7402,7 +8645,7 @@ static PyObject *_wrap_Font_GetDefaultEncoding(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -7412,11 +8655,14 @@ static PyObject *_wrap_Font_GetDefaultEncoding(PyObject *self, PyObject *args, P
 static PyObject *_wrap_Font_SetDefaultEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
 static PyObject *_wrap_Font_SetDefaultEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;

+    PyObject * obj0 = 0 ;

     char *kwnames[] = {
         (char *) "encoding", NULL 
     };
     
     char *kwnames[] = {
         (char *) "encoding", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Font_SetDefaultEncoding",kwnames,&arg1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_SetDefaultEncoding",kwnames,&obj0)) goto fail;
+    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxFont::SetDefaultEncoding((wxFontEncoding )arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxFont::SetDefaultEncoding((wxFontEncoding )arg1);


@@ -7453,7 +8699,7 @@ static PyObject *_wrap_new_FontEnumerator(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyFontEnumerator, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyFontEnumerator, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -7469,7 +8715,8 @@ static PyObject *_wrap_delete_FontEnumerator(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_FontEnumerator",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_FontEnumerator",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFontEnumerator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFontEnumerator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -7499,10 +8746,11 @@ static PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FontEnumerator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FontEnumerator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFontEnumerator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFontEnumerator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     arg2 = obj1;
     arg3 = obj2;
     arg2 = obj1;
     arg3 = obj2;

-    arg4 = PyInt_AsLong(obj3) ? true : false;
+    arg4 = (bool) SWIG_AsBool(obj3); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -7522,18 +8770,24 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObjec
     PyObject *resultobj;
     wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
     int arg2 = (int) wxFONTENCODING_SYSTEM ;
     PyObject *resultobj;
     wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
     int arg2 = (int) wxFONTENCODING_SYSTEM ;

-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;

     bool result;
     PyObject * obj0 = 0 ;
     bool result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     PyObject * obj2 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "encoding",(char *) "fixedWidthOnly", NULL 
     };
     
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "encoding",(char *) "fixedWidthOnly", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:FontEnumerator_EnumerateFacenames",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFontEnumerator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:FontEnumerator_EnumerateFacenames",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFontEnumerator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj1) {
+        arg2 = (wxFontEncoding) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     if (obj2) {
     if (obj2) {

-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -7543,7 +8797,9 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -7556,7 +8812,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec
     wxString const &arg2_defvalue = wxPyEmptyString ;
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     bool result;
     wxString const &arg2_defvalue = wxPyEmptyString ;
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     bool result;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -7564,12 +8820,13 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:FontEnumerator_EnumerateEncodings",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:FontEnumerator_EnumerateEncodings",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFontEnumerator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFontEnumerator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;

-            temp2 = true;
+            temp2 = True;

         }
     }
     {
         }
     }
     {


@@ -7579,7 +8836,9 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp2)
         delete arg2;
     {
         if (temp2)
         delete arg2;


@@ -7604,7 +8863,8 @@ static PyObject *_wrap_FontEnumerator_GetEncodings(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontEnumerator_GetEncodings",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontEnumerator_GetEncodings",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFontEnumerator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFontEnumerator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPyFontEnumerator_GetEncodings(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPyFontEnumerator_GetEncodings(arg1);


@@ -7629,7 +8889,8 @@ static PyObject *_wrap_FontEnumerator_GetFacenames(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontEnumerator_GetFacenames",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontEnumerator_GetFacenames",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFontEnumerator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFontEnumerator,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPyFontEnumerator_GetFacenames(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (PyObject *)wxPyFontEnumerator_GetFacenames(arg1);


@@ -7656,12 +8917,16 @@ static PyObject *_wrap_LanguageInfo_Language_set(PyObject *self, PyObject *args,
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "Language", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "Language", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:LanguageInfo_Language_set",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_Language_set",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLanguageInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     if (arg1) (arg1)->Language = arg2;
     
     Py_INCREF(Py_None); resultobj = Py_None;
     if (arg1) (arg1)->Language = arg2;
     
     Py_INCREF(Py_None); resultobj = Py_None;


@@ -7681,10 +8946,11 @@ static PyObject *_wrap_LanguageInfo_Language_get(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_Language_get",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_Language_get",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLanguageInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     result = (int) ((arg1)->Language);
     
     result = (int) ((arg1)->Language);
     

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -7694,8 +8960,8 @@ static PyObject *_wrap_LanguageInfo_Language_get(PyObject *self, PyObject *args,
 static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
 static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;

-    wxString arg2 ;
-    wxString *argp2 ;
+    wxString *arg2 = (wxString *) 0 ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -7703,14 +8969,26 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_CanonicalName_set",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_CanonicalName_set",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
-    if (arg1) (arg1)->CanonicalName = arg2;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLanguageInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        arg2 = wxString_in_helper(obj1);
+        if (arg2 == NULL) SWIG_fail;
+        temp2 = True;
+    }
+    if (arg1) (arg1)->CanonicalName = *arg2;

     
     Py_INCREF(Py_None); resultobj = Py_None;
     
     Py_INCREF(Py_None); resultobj = Py_None;

+    {
+        if (temp2)
+        delete arg2;
+    }

     return resultobj;
     fail:
     return resultobj;
     fail:

+    {
+        if (temp2)
+        delete arg2;
+    }

     return NULL;
 }
 
     return NULL;
 }
 


@@ -7718,21 +8996,22 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *
 static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
 static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;

-    wxString result;
+    wxString *result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_CanonicalName_get",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_CanonicalName_get",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    result =  ((arg1)->CanonicalName);
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLanguageInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    result = (wxString *)& ((arg1)->CanonicalName);

     
     {
 #if wxUSE_UNICODE
     
     {
 #if wxUSE_UNICODE

-        resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+        resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());

 #else
 #else

-        resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+        resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());

 #endif
     }
     return resultobj;
 #endif
     }
     return resultobj;


@@ -7744,8 +9023,8 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *
 static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
 static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;

-    wxString arg2 ;
-    wxString *argp2 ;
+    wxString *arg2 = (wxString *) 0 ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -7753,14 +9032,26 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_Description_set",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_Description_set",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
-    if (arg1) (arg1)->Description = arg2;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLanguageInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        arg2 = wxString_in_helper(obj1);
+        if (arg2 == NULL) SWIG_fail;
+        temp2 = True;
+    }
+    if (arg1) (arg1)->Description = *arg2;

     
     Py_INCREF(Py_None); resultobj = Py_None;
     
     Py_INCREF(Py_None); resultobj = Py_None;

+    {
+        if (temp2)
+        delete arg2;
+    }

     return resultobj;
     fail:
     return resultobj;
     fail:

+    {
+        if (temp2)
+        delete arg2;
+    }

     return NULL;
 }
 
     return NULL;
 }
 


@@ -7768,21 +9059,22 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *ar
 static PyObject *_wrap_LanguageInfo_Description_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
 static PyObject *_wrap_LanguageInfo_Description_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;

-    wxString result;
+    wxString *result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_Description_get",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_Description_get",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    result =  ((arg1)->Description);
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLanguageInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    result = (wxString *)& ((arg1)->Description);

     
     {
 #if wxUSE_UNICODE
     
     {
 #if wxUSE_UNICODE

-        resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+        resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());

 #else
 #else

-        resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+        resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());

 #endif
     }
     return resultobj;
 #endif
     }
     return resultobj;


@@ -7803,11 +9095,21 @@ static PyObject *_wrap_new_Locale(PyObject *self, PyObject *args, PyObject *kwar
     int arg1 = (int) wxLANGUAGE_DEFAULT ;
     int arg2 = (int) wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING ;
     wxLocale *result;
     int arg1 = (int) wxLANGUAGE_DEFAULT ;
     int arg2 = (int) wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING ;
     wxLocale *result;

+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "language",(char *) "flags", NULL 
     };
     
     char *kwnames[] = {
         (char *) "language",(char *) "flags", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_Locale",kwnames,&arg1,&arg2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Locale",kwnames,&obj0,&obj1)) goto fail;
+    if (obj0) {
+        arg1 = (int) SWIG_AsInt(obj0); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxLocale *)new wxLocale(arg1,arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxLocale *)new wxLocale(arg1,arg2);


@@ -7815,7 +9117,7 @@ static PyObject *_wrap_new_Locale(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxLocale, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxLocale, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -7831,7 +9133,8 @@ static PyObject *_wrap_delete_Locale(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Locale",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Locale",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLocale,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -7854,12 +9157,12 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;

-    bool arg5 = (bool) TRUE ;
-    bool arg6 = (bool) FALSE ;
+    bool arg5 = (bool) True ;
+    bool arg6 = (bool) False ;

     bool result;
     bool result;

-    bool temp2 = false ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
+    bool temp4 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;


@@ -7871,32 +9174,33 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Locale_Init1",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Locale_Init1",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLocale,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;

-            temp3 = true;
+            temp3 = True;

         }
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
         }
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;

-            temp4 = true;
+            temp4 = True;

         }
     }
     if (obj4) {
         }
     }
     if (obj4) {

-        arg5 = PyInt_AsLong(obj4) ? true : false;
+        arg5 = (bool) SWIG_AsBool(obj4); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {

-        arg6 = PyInt_AsLong(obj5) ? true : false;
+        arg6 = (bool) SWIG_AsBool(obj5); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -7906,7 +9210,9 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp2)
         delete arg2;
     {
         if (temp2)
         delete arg2;


@@ -7944,12 +9250,23 @@ static PyObject *_wrap_Locale_Init2(PyObject *self, PyObject *args, PyObject *kw
     int arg3 = (int) wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING ;
     bool result;
     PyObject * obj0 = 0 ;
     int arg3 = (int) wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING ;
     bool result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "language",(char *) "flags", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "language",(char *) "flags", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:Locale_Init2",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Locale_Init2",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLocale,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Init(arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Init(arg2,arg3);


@@ -7957,7 +9274,9 @@ static PyObject *_wrap_Locale_Init2(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -7979,7 +9298,7 @@ static PyObject *_wrap_Locale_GetSystemLanguage(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -8001,7 +9320,7 @@ static PyObject *_wrap_Locale_GetSystemEncoding(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -8046,7 +9365,8 @@ static PyObject *_wrap_Locale_IsOk(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_IsOk",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_IsOk",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLocale,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxLocale const *)arg1)->IsOk();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxLocale const *)arg1)->IsOk();


@@ -8054,7 +9374,9 @@ static PyObject *_wrap_Locale_IsOk(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -8071,7 +9393,8 @@ static PyObject *_wrap_Locale_GetLocale(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLocale",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLocale",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLocale,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxLocale const *)arg1)->GetLocale();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxLocale const *)arg1)->GetLocale();


@@ -8102,7 +9425,8 @@ static PyObject *_wrap_Locale_GetLanguage(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLanguage",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLanguage",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLocale,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxLocale const *)arg1)->GetLanguage();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxLocale const *)arg1)->GetLanguage();


@@ -8110,7 +9434,7 @@ static PyObject *_wrap_Locale_GetLanguage(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -8127,7 +9451,8 @@ static PyObject *_wrap_Locale_GetSysName(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetSysName",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetSysName",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLocale,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxLocale const *)arg1)->GetSysName();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxLocale const *)arg1)->GetSysName();


@@ -8158,7 +9483,8 @@ static PyObject *_wrap_Locale_GetCanonicalName(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetCanonicalName",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetCanonicalName",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLocale,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxLocale const *)arg1)->GetCanonicalName();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxLocale const *)arg1)->GetCanonicalName();


@@ -8182,7 +9508,7 @@ static PyObject *_wrap_Locale_GetCanonicalName(PyObject *self, PyObject *args, P
 static PyObject *_wrap_Locale_AddCatalogLookupPathPrefix(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
 static PyObject *_wrap_Locale_AddCatalogLookupPathPrefix(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;

-    bool temp1 = false ;
+    bool temp1 = False ;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "prefix", NULL 
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "prefix", NULL 


@@ -8192,7 +9518,7 @@ static PyObject *_wrap_Locale_AddCatalogLookupPathPrefix(PyObject *self, PyObjec
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;

-        temp1 = true;
+        temp1 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -8221,7 +9547,7 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObjec
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString *arg2 = 0 ;
     bool result;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -8229,11 +9555,12 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Locale_AddCatalog",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Locale_AddCatalog",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLocale,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -8242,7 +9569,9 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp2)
         delete arg2;
     {
         if (temp2)
         delete arg2;


@@ -8262,7 +9591,7 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString *arg2 = 0 ;
     bool result;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -8270,11 +9599,12 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Locale_IsLoaded",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Locale_IsLoaded",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLocale,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -8283,7 +9613,9 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp2)
         delete arg2;
     {
         if (temp2)
         delete arg2;


@@ -8302,11 +9634,14 @@ static PyObject *_wrap_Locale_GetLanguageInfo(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     int arg1 ;
     wxLanguageInfo *result;
     PyObject *resultobj;
     int arg1 ;
     wxLanguageInfo *result;

+    PyObject * obj0 = 0 ;

     char *kwnames[] = {
         (char *) "lang", NULL 
     };
     
     char *kwnames[] = {
         (char *) "lang", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Locale_GetLanguageInfo",kwnames,&arg1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLanguageInfo",kwnames,&obj0)) goto fail;
+    arg1 = (int) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxLanguageInfo *)wxLocale::GetLanguageInfo(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxLanguageInfo *)wxLocale::GetLanguageInfo(arg1);


@@ -8314,7 +9649,7 @@ static PyObject *_wrap_Locale_GetLanguageInfo(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxLanguageInfo, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxLanguageInfo, 0);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -8325,11 +9660,14 @@ static PyObject *_wrap_Locale_GetLanguageName(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     int arg1 ;
     wxString result;
     PyObject *resultobj;
     int arg1 ;
     wxString result;

+    PyObject * obj0 = 0 ;

     char *kwnames[] = {
         (char *) "lang", NULL 
     };
     
     char *kwnames[] = {
         (char *) "lang", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Locale_GetLanguageName",kwnames,&arg1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLanguageName",kwnames,&obj0)) goto fail;
+    arg1 = (int) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxLocale::GetLanguageName(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxLocale::GetLanguageName(arg1);


@@ -8354,7 +9692,7 @@ static PyObject *_wrap_Locale_FindLanguageInfo(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxLanguageInfo *result;
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxLanguageInfo *result;

-    bool temp1 = false ;
+    bool temp1 = False ;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "locale", NULL 
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "locale", NULL 


@@ -8364,7 +9702,7 @@ static PyObject *_wrap_Locale_FindLanguageInfo(PyObject *self, PyObject *args, P
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;

-        temp1 = true;
+        temp1 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -8373,7 +9711,7 @@ static PyObject *_wrap_Locale_FindLanguageInfo(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxLanguageInfo, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxLanguageInfo, 0);

     {
         if (temp1)
         delete arg1;
     {
         if (temp1)
         delete arg1;


@@ -8397,9 +9735,12 @@ static PyObject *_wrap_Locale_AddLanguage(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_AddLanguage",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_AddLanguage",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLanguageInfo,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -8422,8 +9763,8 @@ static PyObject *_wrap_Locale_GetString(PyObject *self, PyObject *args, PyObject
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxString result;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxString result;

-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;


@@ -8432,17 +9773,18 @@ static PyObject *_wrap_Locale_GetString(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Locale_GetString",kwnames,&obj0,&obj1,&obj2)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Locale_GetString",kwnames,&obj0,&obj1,&obj2)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLocale,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;

-            temp3 = true;
+            temp3 = True;

         }
     }
     {
         }
     }
     {


@@ -8491,7 +9833,8 @@ static PyObject *_wrap_Locale_GetName(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetName",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetName",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLocale,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {


@@ -8502,7 +9845,13 @@ static PyObject *_wrap_Locale_GetName(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0);
+    {
+#if wxUSE_UNICODE
+        resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
+#else
+        resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
+#endif
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -8531,7 +9880,7 @@ static PyObject *_wrap_GetLocale(PyObject *self, PyObject *args, PyObject *kwarg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxLocale, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxLocale, 0);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -8542,14 +9891,14 @@ static PyObject *_wrap_GetTranslation__SWIG_0(PyObject *self, PyObject *args) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;

-    bool temp1 = false ;
+    bool temp1 = False ;

     PyObject * obj0 = 0 ;
     
     if(!PyArg_ParseTuple(args,(char *)"O:GetTranslation",&obj0)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
     PyObject * obj0 = 0 ;
     
     if(!PyArg_ParseTuple(args,(char *)"O:GetTranslation",&obj0)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;

-        temp1 = true;
+        temp1 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -8585,8 +9934,8 @@ static PyObject *_wrap_GetTranslation__SWIG_1(PyObject *self, PyObject *args) {
     wxString *arg2 = 0 ;
     size_t arg3 ;
     wxString result;
     wxString *arg2 = 0 ;
     size_t arg3 ;
     wxString result;

-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;


@@ -8595,14 +9944,14 @@ static PyObject *_wrap_GetTranslation__SWIG_1(PyObject *self, PyObject *args) {
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;

-        temp1 = true;
+        temp1 = True;

     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     }

-    arg3 = (size_t) PyInt_AsLong(obj2);
+    arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -8652,13 +10001,7 @@ static PyObject *_wrap_GetTranslation(PyObject *self, PyObject *args) {
     if (argc == 1) {
         int _v;
         {
     if (argc == 1) {
         int _v;
         {

-            void *ptr;
-            if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) {
-                _v = 0;
-                PyErr_Clear();
-            } else {
-                _v = 1;
-            }
+            _v = PyString_Check(argv[0]) || PyUnicode_Check(argv[0]);

         }
         if (_v) {
             return _wrap_GetTranslation__SWIG_0(self,args);
         }
         if (_v) {
             return _wrap_GetTranslation__SWIG_0(self,args);


@@ -8667,28 +10010,14 @@ static PyObject *_wrap_GetTranslation(PyObject *self, PyObject *args) {
     if (argc == 3) {
         int _v;
         {
     if (argc == 3) {
         int _v;
         {

-            void *ptr;
-            if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) {
-                _v = 0;
-                PyErr_Clear();
-            } else {
-                _v = 1;
-            }
+            _v = PyString_Check(argv[0]) || PyUnicode_Check(argv[0]);

         }
         if (_v) {
             {
         }
         if (_v) {
             {

-                void *ptr;
-                if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) {
-                    _v = 0;
-                    PyErr_Clear();
-                } else {
-                    _v = 1;
-                }
+                _v = PyString_Check(argv[1]) || PyUnicode_Check(argv[1]);

             }
             if (_v) {
             }
             if (_v) {

-                {
-                    _v = (PyInt_Check(argv[2]) || PyLong_Check(argv[2])) ? 1 : 0;
-                }
+                _v = SWIG_CheckUnsignedLong(argv[2]);

                 if (_v) {
                     return _wrap_GetTranslation__SWIG_1(self,args);
                 }
                 if (_v) {
                     return _wrap_GetTranslation__SWIG_1(self,args);
                 }


@@ -8716,7 +10045,7 @@ static PyObject *_wrap_new_EncodingConverter(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxEncodingConverter, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEncodingConverter, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -8732,7 +10061,8 @@ static PyObject *_wrap_delete_EncodingConverter(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_EncodingConverter",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_EncodingConverter",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEncodingConverter,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEncodingConverter,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -8755,12 +10085,24 @@ static PyObject *_wrap_EncodingConverter_Init(PyObject *self, PyObject *args, Py
     int arg4 = (int) wxCONVERT_STRICT ;
     bool result;
     PyObject * obj0 = 0 ;
     int arg4 = (int) wxCONVERT_STRICT ;
     bool result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "input_enc",(char *) "output_enc",(char *) "method", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "input_enc",(char *) "output_enc",(char *) "method", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:EncodingConverter_Init",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEncodingConverter,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:EncodingConverter_Init",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEncodingConverter,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (wxFontEncoding) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (wxFontEncoding) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Init((wxFontEncoding )arg2,(wxFontEncoding )arg3,arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Init((wxFontEncoding )arg2,(wxFontEncoding )arg3,arg4);


@@ -8768,7 +10110,9 @@ static PyObject *_wrap_EncodingConverter_Init(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -8780,7 +10124,7 @@ static PyObject *_wrap_EncodingConverter_Convert(PyObject *self, PyObject *args,
     wxEncodingConverter *arg1 = (wxEncodingConverter *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;
     wxEncodingConverter *arg1 = (wxEncodingConverter *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -8788,11 +10132,12 @@ static PyObject *_wrap_EncodingConverter_Convert(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EncodingConverter_Convert",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EncodingConverter_Convert",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEncodingConverter,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEncodingConverter,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -8827,11 +10172,19 @@ static PyObject *_wrap_EncodingConverter_GetPlatformEquivalents(PyObject *self,
     int arg1 ;
     int arg2 = (int) wxPLATFORM_CURRENT ;
     wxFontEncodingArray result;
     int arg1 ;
     int arg2 = (int) wxPLATFORM_CURRENT ;
     wxFontEncodingArray result;

+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "enc",(char *) "platform", NULL 
     };
     
     char *kwnames[] = {
         (char *) "enc",(char *) "platform", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|i:EncodingConverter_GetPlatformEquivalents",kwnames,&arg1,&arg2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:EncodingConverter_GetPlatformEquivalents",kwnames,&obj0,&obj1)) goto fail;
+    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxEncodingConverter::GetPlatformEquivalents((wxFontEncoding )arg1,arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxEncodingConverter::GetPlatformEquivalents((wxFontEncoding )arg1,arg2);


@@ -8857,11 +10210,14 @@ static PyObject *_wrap_EncodingConverter_GetAllEquivalents(PyObject *self, PyObj
     PyObject *resultobj;
     int arg1 ;
     wxFontEncodingArray result;
     PyObject *resultobj;
     int arg1 ;
     wxFontEncodingArray result;

+    PyObject * obj0 = 0 ;

     char *kwnames[] = {
         (char *) "enc", NULL 
     };
     
     char *kwnames[] = {
         (char *) "enc", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:EncodingConverter_GetAllEquivalents",kwnames,&arg1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EncodingConverter_GetAllEquivalents",kwnames,&obj0)) goto fail;
+    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxEncodingConverter::GetAllEquivalents((wxFontEncoding )arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxEncodingConverter::GetAllEquivalents((wxFontEncoding )arg1);


@@ -8888,11 +10244,17 @@ static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *self, PyObject *ar
     int arg1 ;
     int arg2 ;
     bool result;
     int arg1 ;
     int arg2 ;
     bool result;

+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "encIn",(char *) "encOut", NULL 
     };
     
     char *kwnames[] = {
         (char *) "encIn",(char *) "encOut", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii:EncodingConverter_CanConvert",kwnames,&arg1,&arg2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EncodingConverter_CanConvert",kwnames,&obj0,&obj1)) goto fail;
+    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg2 = (wxFontEncoding) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)wxEncodingConverter::CanConvert((wxFontEncoding )arg1,(wxFontEncoding )arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)wxEncodingConverter::CanConvert((wxFontEncoding )arg1,(wxFontEncoding )arg2);


@@ -8900,7 +10262,9 @@ static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -8923,7 +10287,8 @@ static PyObject *_wrap_delete_DC(PyObject *self, PyObject *args, PyObject *kwarg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_DC",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_DC",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -8947,7 +10312,8 @@ static PyObject *_wrap_DC_BeginDrawing(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_BeginDrawing",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_BeginDrawing",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->BeginDrawing();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->BeginDrawing();


@@ -8971,7 +10337,8 @@ static PyObject *_wrap_DC_EndDrawing(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_EndDrawing",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_EndDrawing",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->EndDrawing();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->EndDrawing();


@@ -8989,24 +10356,36 @@ static PyObject *_wrap_DC_EndDrawing(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;

     wxColour *arg4 = 0 ;
     int arg5 = (int) wxFLOOD_SURFACE ;
     bool result;
     wxColour temp4 ;
     PyObject * obj0 = 0 ;
     wxColour *arg4 = 0 ;
     int arg5 = (int) wxFLOOD_SURFACE ;
     bool result;
     wxColour temp4 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     PyObject * obj3 = 0 ;
     PyObject * obj3 = 0 ;

+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "col",(char *) "style", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "col",(char *) "style", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO|i:DC_FloodFillXY",kwnames,&obj0,&arg2,&arg3,&obj3,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_FloodFillXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         arg4 = &temp4;
         if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail;
     }
     {
         arg4 = &temp4;
         if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail;
     }

+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->FloodFill(arg2,arg3,(wxColour const &)*arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->FloodFill(arg2,arg3,(wxColour const &)*arg4,arg5);


@@ -9014,7 +10393,9 @@ static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -9033,12 +10414,14 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;

+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "pt",(char *) "col",(char *) "style", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "pt",(char *) "col",(char *) "style", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;


@@ -9047,6 +10430,10 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw
         arg3 = &temp3;
         if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
     }
         arg3 = &temp3;
         if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
     }

+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->FloodFill((wxPoint const &)*arg2,(wxColour const &)*arg3,arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->FloodFill((wxPoint const &)*arg2,(wxColour const &)*arg3,arg4);


@@ -9054,7 +10441,9 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -9064,16 +10453,23 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_DC_GetPixelXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_GetPixelXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;

     wxColour result;
     PyObject * obj0 = 0 ;
     wxColour result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:DC_GetPixelXY",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_GetPixelXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxDC_GetPixelXY(arg1,arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxDC_GetPixelXY(arg1,arg2,arg3);


@@ -9084,7 +10480,7 @@ static PyObject *_wrap_DC_GetPixelXY(PyObject *self, PyObject *args, PyObject *k
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -9105,7 +10501,8 @@ static PyObject *_wrap_DC_GetPixel(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_GetPixel",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_GetPixel",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;


@@ -9120,7 +10517,7 @@ static PyObject *_wrap_DC_GetPixel(PyObject *self, PyObject *args, PyObject *kwa
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -9131,17 +10528,30 @@ static PyObject *_wrap_DC_GetPixel(PyObject *self, PyObject *args, PyObject *kwa
 static PyObject *_wrap_DC_DrawLineXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_DrawLineXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawLineXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawLineXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawLine(arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawLine(arg2,arg3,arg4,arg5);


@@ -9171,7 +10581,8 @@ static PyObject *_wrap_DC_DrawLine(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawLine",kwnames,&obj0,&obj1,&obj2)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawLine",kwnames,&obj0,&obj1,&obj2)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;


@@ -9197,15 +10608,22 @@ static PyObject *_wrap_DC_DrawLine(PyObject *self, PyObject *args, PyObject *kwa
 static PyObject *_wrap_DC_CrossHairXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_CrossHairXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:DC_CrossHairXY",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_CrossHairXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->CrossHair(arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->CrossHair(arg2,arg3);


@@ -9232,7 +10650,8 @@ static PyObject *_wrap_DC_CrossHair(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_CrossHair",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_CrossHair",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;


@@ -9254,19 +10673,38 @@ static PyObject *_wrap_DC_CrossHair(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_DC_DrawArcXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_DrawArcXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
-    wxCoord arg6 ;
-    wxCoord arg7 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
+    int arg6 ;
+    int arg7 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2",(char *) "xc",(char *) "yc", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2",(char *) "xc",(char *) "yc", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiiiii:DC_DrawArcXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawArcXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (int) SWIG_AsInt(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg7 = (int) SWIG_AsInt(obj6); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawArc(arg2,arg3,arg4,arg5,arg6,arg7);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawArc(arg2,arg3,arg4,arg5,arg6,arg7);


@@ -9299,7 +10737,8 @@ static PyObject *_wrap_DC_DrawArc(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;


@@ -9329,17 +10768,30 @@ static PyObject *_wrap_DC_DrawArc(PyObject *self, PyObject *args, PyObject *kwar
 static PyObject *_wrap_DC_DrawCheckMarkXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_DrawCheckMarkXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawCheckMarkXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawCheckMarkXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawCheckMark(arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawCheckMark(arg2,arg3,arg4,arg5);


@@ -9366,7 +10818,8 @@ static PyObject *_wrap_DC_DrawCheckMark(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawCheckMark",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawCheckMark",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;


@@ -9388,19 +10841,38 @@ static PyObject *_wrap_DC_DrawCheckMark(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_DC_DrawEllipticArcXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_DrawEllipticArcXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;

     double arg6 ;
     double arg7 ;
     PyObject * obj0 = 0 ;
     double arg6 ;
     double arg7 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h",(char *) "sa",(char *) "ea", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h",(char *) "sa",(char *) "ea", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiiidd:DC_DrawEllipticArcXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawEllipticArcXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg7 = (double) SWIG_AsDouble(obj6); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawEllipticArc(arg2,arg3,arg4,arg5,arg6,arg7);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawEllipticArc(arg2,arg3,arg4,arg5,arg6,arg7);


@@ -9427,12 +10899,15 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;

+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "pt",(char *) "sz",(char *) "sa",(char *) "ea", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "pt",(char *) "sz",(char *) "sa",(char *) "ea", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd:DC_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;


@@ -9441,6 +10916,10 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje
         arg3 = &temp3;
         if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail;
     }
         arg3 = &temp3;
         if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail;
     }

+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawEllipticArc((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawEllipticArc((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4,arg5);


@@ -9458,15 +10937,22 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_DC_DrawPointXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_DrawPointXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:DC_DrawPointXY",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawPointXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawPoint(arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawPoint(arg2,arg3);


@@ -9493,7 +10979,8 @@ static PyObject *_wrap_DC_DrawPoint(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawPoint",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawPoint",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;


@@ -9515,17 +11002,30 @@ static PyObject *_wrap_DC_DrawPoint(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_DC_DrawRectangleXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_DrawRectangleXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawRectangleXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawRectangleXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawRectangle(arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawRectangle(arg2,arg3,arg4,arg5);


@@ -9555,7 +11055,8 @@ static PyObject *_wrap_DC_DrawRectangle(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawRectangle",kwnames,&obj0,&obj1,&obj2)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawRectangle",kwnames,&obj0,&obj1,&obj2)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;


@@ -9590,7 +11091,8 @@ static PyObject *_wrap_DC_DrawRectangleRect(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawRectangleRect",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawRectangleRect",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;


@@ -9612,18 +11114,34 @@ static PyObject *_wrap_DC_DrawRectangleRect(PyObject *self, PyObject *args, PyOb
 static PyObject *_wrap_DC_DrawRoundedRectangleXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_DrawRoundedRectangleXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;

     double arg6 ;
     PyObject * obj0 = 0 ;
     double arg6 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "radius", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "radius", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiiid:DC_DrawRoundedRectangleXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:DC_DrawRoundedRectangleXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawRoundedRectangle(arg2,arg3,arg4,arg5,arg6);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawRoundedRectangle(arg2,arg3,arg4,arg5,arg6);


@@ -9649,12 +11167,14 @@ static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, P
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;

+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "pt",(char *) "sz",(char *) "radius", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "pt",(char *) "sz",(char *) "radius", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOd:DC_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;


@@ -9663,6 +11183,8 @@ static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, P
         arg3 = &temp3;
         if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail;
     }
         arg3 = &temp3;
         if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail;
     }

+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawRoundedRectangle((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawRoundedRectangle((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4);


@@ -9685,16 +11207,20 @@ static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *self, PyObject *arg
     wxRect temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     wxRect temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "r",(char *) "radius", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "r",(char *) "radius", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOd:DC_DrawRoundedRectangleRect",kwnames,&obj0,&obj1,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawRoundedRectangleRect",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }

+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3);


@@ -9712,16 +11238,26 @@ static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *self, PyObject *arg
 static PyObject *_wrap_DC_DrawCircleXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_DrawCircleXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "radius", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "radius", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:DC_DrawCircleXY",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawCircleXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawCircle(arg2,arg3,arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawCircle(arg2,arg3,arg4);


@@ -9740,20 +11276,24 @@ static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;

-    wxCoord arg3 ;
+    int arg3 ;

     wxPoint temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     wxPoint temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "pt",(char *) "radius", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "pt",(char *) "radius", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:DC_DrawCircle",kwnames,&obj0,&obj1,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawCircle",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     }
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     }

+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawCircle((wxPoint const &)*arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawCircle((wxPoint const &)*arg2,arg3);


@@ -9771,17 +11311,30 @@ static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_DC_DrawEllipseXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_DrawEllipseXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawEllipseXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawEllipseXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawEllipse(arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawEllipse(arg2,arg3,arg4,arg5);


@@ -9811,7 +11364,8 @@ static PyObject *_wrap_DC_DrawEllipse(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawEllipse",kwnames,&obj0,&obj1,&obj2)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawEllipse",kwnames,&obj0,&obj1,&obj2)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;


@@ -9846,7 +11400,8 @@ static PyObject *_wrap_DC_DrawEllipseRect(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawEllipseRect",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawEllipseRect",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;


@@ -9869,20 +11424,30 @@ static PyObject *_wrap_DC_DrawIconXY(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxIcon *arg2 = 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxIcon *arg2 = 0 ;

-    wxCoord arg3 ;
-    wxCoord arg4 ;
+    int arg3 ;
+    int arg4 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "icon",(char *) "x",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "icon",(char *) "x",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:DC_DrawIconXY",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawIconXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     }

+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawIcon((wxIcon const &)*arg2,arg3,arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawIcon((wxIcon const &)*arg2,arg3,arg4);


@@ -9911,10 +11476,14 @@ static PyObject *_wrap_DC_DrawIcon(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawIcon",kwnames,&obj0,&obj1,&obj2)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawIcon",kwnames,&obj0,&obj1,&obj2)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         arg3 = &temp3;
     }
     {
         arg3 = &temp3;


@@ -9938,24 +11507,34 @@ static PyObject *_wrap_DC_DrawBitmapXY(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxBitmap *arg2 = 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxBitmap *arg2 = 0 ;

-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    bool arg5 = (bool) FALSE ;
+    int arg3 ;
+    int arg4 ;
+    bool arg5 = (bool) False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     PyObject * obj4 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "bmp",(char *) "x",(char *) "y",(char *) "useMask", NULL 
     };
     
     PyObject * obj4 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "bmp",(char *) "x",(char *) "y",(char *) "useMask", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii|O:DC_DrawBitmapXY",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_DrawBitmapXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     }

+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;

     if (obj4) {
     if (obj4) {

-        arg5 = PyInt_AsLong(obj4) ? true : false;
+        arg5 = (bool) SWIG_AsBool(obj4); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -9977,7 +11556,7 @@ static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *k
     wxDC *arg1 = (wxDC *) 0 ;
     wxBitmap *arg2 = 0 ;
     wxPoint *arg3 = 0 ;
     wxDC *arg1 = (wxDC *) 0 ;
     wxBitmap *arg2 = 0 ;
     wxPoint *arg3 = 0 ;

-    bool arg4 = (bool) FALSE ;
+    bool arg4 = (bool) False ;

     wxPoint temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     wxPoint temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;


@@ -9988,17 +11567,21 @@ static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_DrawBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_DrawBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         arg3 = &temp3;
         if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
     }
     if (obj3) {
     }
     {
         arg3 = &temp3;
         if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
     }
     if (obj3) {

-        arg4 = PyInt_AsLong(obj3) ? true : false;
+        arg4 = (bool) SWIG_AsBool(obj3); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -10019,22 +11602,29 @@ static PyObject *_wrap_DC_DrawTextXY(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;

-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    bool temp2 = false ;
+    int arg3 ;
+    int arg4 ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "text",(char *) "x",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "text",(char *) "x",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:DC_DrawTextXY",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawTextXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     }

+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawText((wxString const &)*arg2,arg3,arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawText((wxString const &)*arg2,arg3,arg4);


@@ -10062,7 +11652,7 @@ static PyObject *_wrap_DC_DrawText(PyObject *self, PyObject *args, PyObject *kwa
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
     wxPoint *arg3 = 0 ;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
     wxPoint *arg3 = 0 ;

-    bool temp2 = false ;
+    bool temp2 = False ;

     wxPoint temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     wxPoint temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;


@@ -10072,11 +11662,12 @@ static PyObject *_wrap_DC_DrawText(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawText",kwnames,&obj0,&obj1,&obj2)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawText",kwnames,&obj0,&obj1,&obj2)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         arg3 = &temp3;
     }
     {
         arg3 = &temp3;


@@ -10108,23 +11699,33 @@ static PyObject *_wrap_DC_DrawRotatedTextXY(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;

-    wxCoord arg3 ;
-    wxCoord arg4 ;
+    int arg3 ;
+    int arg4 ;

     double arg5 ;
     double arg5 ;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "text",(char *) "x",(char *) "y",(char *) "angle", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "text",(char *) "x",(char *) "y",(char *) "angle", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiid:DC_DrawRotatedTextXY",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawRotatedTextXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     }

+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawRotatedText((wxString const &)*arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawRotatedText((wxString const &)*arg2,arg3,arg4,arg5);


@@ -10153,26 +11754,30 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje
     wxString *arg2 = 0 ;
     wxPoint *arg3 = 0 ;
     double arg4 ;
     wxString *arg2 = 0 ;
     wxPoint *arg3 = 0 ;
     double arg4 ;

-    bool temp2 = false ;
+    bool temp2 = False ;

     wxPoint temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     wxPoint temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;

+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "text",(char *) "pt",(char *) "angle", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "text",(char *) "pt",(char *) "angle", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOd:DC_DrawRotatedText",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawRotatedText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         arg3 = &temp3;
         if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
     }
     }
     {
         arg3 = &temp3;
         if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
     }

+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawRotatedText((wxString const &)*arg2,(wxPoint const &)*arg3,arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawRotatedText((wxString const &)*arg2,(wxPoint const &)*arg3,arg4);


@@ -10198,30 +11803,65 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;

     wxDC *arg6 = (wxDC *) 0 ;
     wxDC *arg6 = (wxDC *) 0 ;

-    wxCoord arg7 ;
-    wxCoord arg8 ;
+    int arg7 ;
+    int arg8 ;

     int arg9 = (int) wxCOPY ;
     int arg9 = (int) wxCOPY ;

-    bool arg10 = (bool) FALSE ;
-    wxCoord arg11 = (wxCoord) -1 ;
-    wxCoord arg12 = (wxCoord) -1 ;
+    bool arg10 = (bool) False ;
+    int arg11 = (int) -1 ;
+    int arg12 = (int) -1 ;

     bool result;
     PyObject * obj0 = 0 ;
     bool result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     PyObject * obj5 = 0 ;
     PyObject * obj5 = 0 ;

+    PyObject * obj6 = 0 ;
+    PyObject * obj7 = 0 ;
+    PyObject * obj8 = 0 ;

     PyObject * obj9 = 0 ;
     PyObject * obj9 = 0 ;

+    PyObject * obj10 = 0 ;
+    PyObject * obj11 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "xdest",(char *) "ydest",(char *) "width",(char *) "height",(char *) "source",(char *) "xsrc",(char *) "ysrc",(char *) "rop",(char *) "useMask",(char *) "xsrcMask",(char *) "ysrcMask", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "xdest",(char *) "ydest",(char *) "width",(char *) "height",(char *) "source",(char *) "xsrc",(char *) "ysrc",(char *) "rop",(char *) "useMask",(char *) "xsrcMask",(char *) "ysrcMask", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiiiOii|iOii:DC_BlitXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&arg7,&arg8,&arg9,&obj9,&arg11,&arg12)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO|OOOO:DC_BlitXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg7 = (int) SWIG_AsInt(obj6); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg8 = (int) SWIG_AsInt(obj7); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj8) {
+        arg9 = (int) SWIG_AsInt(obj8); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     if (obj9) {
     if (obj9) {

-        arg10 = PyInt_AsLong(obj9) ? true : false;
+        arg10 = (bool) SWIG_AsBool(obj9); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj10) {
+        arg11 = (int) SWIG_AsInt(obj10); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj11) {
+        arg12 = (int) SWIG_AsInt(obj11); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -10231,7 +11871,9 @@ static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwarg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -10246,7 +11888,7 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs)
     wxDC *arg4 = (wxDC *) 0 ;
     wxPoint *arg5 = 0 ;
     int arg6 = (int) wxCOPY ;
     wxDC *arg4 = (wxDC *) 0 ;
     wxPoint *arg5 = 0 ;
     int arg6 = (int) wxCOPY ;

-    bool arg7 = (bool) FALSE ;
+    bool arg7 = (bool) False ;

     wxPoint const &arg8_defvalue = wxDefaultPosition ;
     wxPoint *arg8 = (wxPoint *) &arg8_defvalue ;
     bool result;
     wxPoint const &arg8_defvalue = wxDefaultPosition ;
     wxPoint *arg8 = (wxPoint *) &arg8_defvalue ;
     bool result;


@@ -10259,14 +11901,16 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs)
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
     PyObject * obj4 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
     PyObject * obj4 = 0 ;

+    PyObject * obj5 = 0 ;

     PyObject * obj6 = 0 ;
     PyObject * obj7 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "destPt",(char *) "sz",(char *) "source",(char *) "srcPt",(char *) "rop",(char *) "useMask",(char *) "srcPtMask", NULL 
     };
     
     PyObject * obj6 = 0 ;
     PyObject * obj7 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "destPt",(char *) "sz",(char *) "source",(char *) "srcPt",(char *) "rop",(char *) "useMask",(char *) "srcPtMask", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|iOO:DC_Blit",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:DC_Blit",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;


@@ -10275,13 +11919,18 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs)
         arg3 = &temp3;
         if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail;
     }
         arg3 = &temp3;
         if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail;
     }

-    if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg5 = &temp5;
         if ( ! wxPoint_helper(obj4, &arg5)) SWIG_fail;
     }
     {
         arg5 = &temp5;
         if ( ! wxPoint_helper(obj4, &arg5)) SWIG_fail;
     }

+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     if (obj6) {
     if (obj6) {

-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {


@@ -10297,7 +11946,9 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -10309,20 +11960,31 @@ static PyObject *_wrap_DC_DrawLines(PyObject *self, PyObject *args, PyObject *kw
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
     wxPoint *arg3 = (wxPoint *) 0 ;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
     wxPoint *arg3 = (wxPoint *) 0 ;

-    wxCoord arg4 = (wxCoord) 0 ;
-    wxCoord arg5 = (wxCoord) 0 ;
+    int arg4 = (int) 0 ;
+    int arg5 = (int) 0 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "points",(char *) "xoffset",(char *) "yoffset", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "points",(char *) "xoffset",(char *) "yoffset", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|ii:DC_DrawLines",kwnames,&obj0,&obj1,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DC_DrawLines",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg3 = wxPoint_LIST_helper(obj1, &arg2);
         if (arg3 == NULL) SWIG_fail;
     }
     {
         arg3 = wxPoint_LIST_helper(obj1, &arg2);
         if (arg3 == NULL) SWIG_fail;
     }

+    if (obj2) {
+        arg4 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        arg5 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawLines(arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawLines(arg2,arg3,arg4,arg5);


@@ -10348,21 +12010,37 @@ static PyObject *_wrap_DC_DrawPolygon(PyObject *self, PyObject *args, PyObject *
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
     wxPoint *arg3 = (wxPoint *) 0 ;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
     wxPoint *arg3 = (wxPoint *) 0 ;

-    wxCoord arg4 = (wxCoord) 0 ;
-    wxCoord arg5 = (wxCoord) 0 ;
+    int arg4 = (int) 0 ;
+    int arg5 = (int) 0 ;

     int arg6 = (int) wxODDEVEN_RULE ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     int arg6 = (int) wxODDEVEN_RULE ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "points",(char *) "xoffset",(char *) "yoffset",(char *) "fillStyle", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "points",(char *) "xoffset",(char *) "yoffset",(char *) "fillStyle", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iii:DC_DrawPolygon",kwnames,&obj0,&obj1,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:DC_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg3 = wxPoint_LIST_helper(obj1, &arg2);
         if (arg3 == NULL) SWIG_fail;
     }
     {
         arg3 = wxPoint_LIST_helper(obj1, &arg2);
         if (arg3 == NULL) SWIG_fail;
     }

+    if (obj2) {
+        arg4 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        arg5 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg6 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawPolygon(arg2,arg3,arg4,arg5,arg6);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawPolygon(arg2,arg3,arg4,arg5,arg6);


@@ -10390,26 +12068,37 @@ static PyObject *_wrap_DC_DrawLabel(PyObject *self, PyObject *args, PyObject *kw
     wxRect *arg3 = 0 ;
     int arg4 = (int) wxALIGN_LEFT|wxALIGN_TOP ;
     int arg5 = (int) -1 ;
     wxRect *arg3 = 0 ;
     int arg4 = (int) wxALIGN_LEFT|wxALIGN_TOP ;
     int arg5 = (int) -1 ;

-    bool temp2 = false ;
+    bool temp2 = False ;

     wxRect temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     wxRect temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;

+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "text",(char *) "rect",(char *) "alignment",(char *) "indexAccel", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "text",(char *) "rect",(char *) "alignment",(char *) "indexAccel", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|ii:DC_DrawLabel",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:DC_DrawLabel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         arg3 = &temp3;
         if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail;
     }
     }
     {
         arg3 = &temp3;
         if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail;
     }

+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawLabel((wxString const &)*arg2,(wxRect const &)*arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawLabel((wxString const &)*arg2,(wxRect const &)*arg3,arg4,arg5);


@@ -10441,31 +12130,45 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObjec
     int arg5 = (int) wxALIGN_LEFT|wxALIGN_TOP ;
     int arg6 = (int) -1 ;
     wxRect result;
     int arg5 = (int) wxALIGN_LEFT|wxALIGN_TOP ;
     int arg6 = (int) -1 ;
     wxRect result;

-    bool temp2 = false ;
+    bool temp2 = False ;

     wxRect temp4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
     wxRect temp4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;

+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "text",(char *) "image",(char *) "rect",(char *) "alignment",(char *) "indexAccel", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "text",(char *) "image",(char *) "rect",(char *) "alignment",(char *) "indexAccel", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|ii:DC_DrawImageLabel",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:DC_DrawImageLabel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     }

-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg3 == NULL) {
     if (arg3 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         arg4 = &temp4;
         if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
     }
     }
     {
         arg4 = &temp4;
         if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
     }

+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxDC_DrawImageLabel(arg1,(wxString const &)*arg2,(wxBitmap const &)*arg3,(wxRect const &)*arg4,arg5,arg6);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxDC_DrawImageLabel(arg1,(wxString const &)*arg2,(wxBitmap const &)*arg3,(wxRect const &)*arg4,arg5,arg6);


@@ -10476,7 +12179,7 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObjec
     {
         wxRect * resultptr;
         resultptr = new wxRect((wxRect &) result);
     {
         wxRect * resultptr;
         resultptr = new wxRect((wxRect &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRect, 1);

     }
     {
         if (temp2)
     }
     {
         if (temp2)


@@ -10504,7 +12207,8 @@ static PyObject *_wrap_DC_DrawSpline(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawSpline",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawSpline",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg3 = wxPoint_LIST_helper(obj1, &arg2);
         if (arg3 == NULL) SWIG_fail;
     {
         arg3 = wxPoint_LIST_helper(obj1, &arg2);
         if (arg3 == NULL) SWIG_fail;


@@ -10538,7 +12242,8 @@ static PyObject *_wrap_DC_Clear(PyObject *self, PyObject *args, PyObject *kwargs
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_Clear",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_Clear",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Clear();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->Clear();


@@ -10558,7 +12263,7 @@ static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwa
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
     bool result;

-    bool temp2 = false ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -10566,11 +12271,12 @@ static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_StartDoc",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_StartDoc",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -10579,7 +12285,9 @@ static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp2)
         delete arg2;
     {
         if (temp2)
         delete arg2;


@@ -10603,7 +12311,8 @@ static PyObject *_wrap_DC_EndDoc(PyObject *self, PyObject *args, PyObject *kwarg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_EndDoc",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_EndDoc",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->EndDoc();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->EndDoc();


@@ -10627,7 +12336,8 @@ static PyObject *_wrap_DC_StartPage(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_StartPage",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_StartPage",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->StartPage();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->StartPage();


@@ -10651,7 +12361,8 @@ static PyObject *_wrap_DC_EndPage(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_EndPage",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_EndPage",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->EndPage();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->EndPage();


@@ -10677,10 +12388,14 @@ static PyObject *_wrap_DC_SetFont(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetFont",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetFont",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -10707,10 +12422,14 @@ static PyObject *_wrap_DC_SetPen(PyObject *self, PyObject *args, PyObject *kwarg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetPen",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetPen",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -10737,10 +12456,14 @@ static PyObject *_wrap_DC_SetBrush(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetBrush",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetBrush",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -10767,10 +12490,14 @@ static PyObject *_wrap_DC_SetBackground(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetBackground",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetBackground",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -10791,12 +12518,16 @@ static PyObject *_wrap_DC_SetBackgroundMode(PyObject *self, PyObject *args, PyOb
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "mode", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "mode", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_SetBackgroundMode",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetBackgroundMode",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetBackgroundMode(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetBackgroundMode(arg2);


@@ -10822,10 +12553,14 @@ static PyObject *_wrap_DC_SetPalette(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetPalette",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetPalette",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPalette,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -10841,20 +12576,33 @@ static PyObject *_wrap_DC_SetPalette(PyObject *self, PyObject *args, PyObject *k
 }
 
 
 }
 
 

-static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetClippingRegionXY(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_SetClippingRegion",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_SetClippingRegionXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetClippingRegion(arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetClippingRegion(arg2,arg3,arg4,arg5);


@@ -10869,26 +12617,34 @@ static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyOb
 }
 
 
 }
 
 

-static PyObject *_wrap_DC_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxRect *arg2 = 0 ;
-    wxRect temp2 ;
+    wxPoint *arg2 = 0 ;
+    wxSize *arg3 = 0 ;
+    wxPoint temp2 ;
+    wxSize temp3 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self",(char *) "rect", NULL 
+        (char *) "self",(char *) "pt",(char *) "sz", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetClippingRect",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetClippingRegion",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
     {
         arg2 = &temp2;

-        if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
+        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+    }
+    {
+        arg3 = &temp3;
+        if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->SetClippingRegion((wxRect const &)*arg2);
+        (arg1)->SetClippingRegion((wxPoint const &)*arg2,(wxSize const &)*arg3);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;


@@ -10900,25 +12656,61 @@ static PyObject *_wrap_DC_SetClippingRect(PyObject *self, PyObject *args, PyObje
 }
 
 
 }
 
 

-static PyObject *_wrap_DC_SetClippingRegionAsRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxRegion *arg2 = 0 ;
+    wxRect *arg2 = 0 ;
+    wxRect temp2 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {

-        (char *) "self",(char *) "region", NULL 
+        (char *) "self",(char *) "rect", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetClippingRegionAsRegion",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetClippingRect",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        arg2 = &temp2;
+        if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->SetClippingRegion((wxRegion const &)*arg2);
+        (arg1)->SetClippingRegion((wxRect const &)*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_DC_SetClippingRegionAsRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxDC *arg1 = (wxDC *) 0 ;
+    wxRegion *arg2 = 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "region", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetClippingRegionAsRegion",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
+    if (arg2 == NULL) {
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetClippingRegion((wxRegion const &)*arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;


@@ -10939,7 +12731,8 @@ static PyObject *_wrap_DC_DestroyClippingRegion(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_DestroyClippingRegion",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_DestroyClippingRegion",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DestroyClippingRegion();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DestroyClippingRegion();


@@ -10957,14 +12750,14 @@ static PyObject *_wrap_DC_DestroyClippingRegion(PyObject *self, PyObject *args,
 static PyObject *_wrap_DC_GetClippingBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_GetClippingBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord *arg2 = (wxCoord *) 0 ;
-    wxCoord *arg3 = (wxCoord *) 0 ;
-    wxCoord *arg4 = (wxCoord *) 0 ;
-    wxCoord *arg5 = (wxCoord *) 0 ;
-    wxCoord temp2 ;
-    wxCoord temp3 ;
-    wxCoord temp4 ;
-    wxCoord temp5 ;
+    int *arg2 = (int *) 0 ;
+    int *arg3 = (int *) 0 ;
+    int *arg4 = (int *) 0 ;
+    int *arg5 = (int *) 0 ;
+    int temp2 ;
+    int temp3 ;
+    int temp4 ;
+    int temp5 ;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 


@@ -10975,7 +12768,8 @@ static PyObject *_wrap_DC_GetClippingBox(PyObject *self, PyObject *args, PyObjec
     arg4 = &temp4;
     arg5 = &temp5;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetClippingBox",kwnames,&obj0)) goto fail;
     arg4 = &temp4;
     arg5 = &temp5;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetClippingBox",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         ((wxDC const *)arg1)->GetClippingBox(arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         ((wxDC const *)arg1)->GetClippingBox(arg2,arg3,arg4,arg5);


@@ -11016,7 +12810,8 @@ static PyObject *_wrap_DC_GetClippingRect(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetClippingRect",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetClippingRect",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxDC_GetClippingRect(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxDC_GetClippingRect(arg1);


@@ -11027,7 +12822,7 @@ static PyObject *_wrap_DC_GetClippingRect(PyObject *self, PyObject *args, PyObje
     {
         wxRect * resultptr;
         resultptr = new wxRect((wxRect &) result);
     {
         wxRect * resultptr;
         resultptr = new wxRect((wxRect &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRect, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -11038,22 +12833,23 @@ static PyObject *_wrap_DC_GetClippingRect(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_DC_GetCharHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_GetCharHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord result;
+    int result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetCharHeight",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetCharHeight",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->GetCharHeight();
+        result = (int)((wxDC const *)arg1)->GetCharHeight();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11063,22 +12859,23 @@ static PyObject *_wrap_DC_GetCharHeight(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_DC_GetCharWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_GetCharWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord result;
+    int result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetCharWidth",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetCharWidth",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->GetCharWidth();
+        result = (int)((wxDC const *)arg1)->GetCharWidth();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11089,11 +12886,11 @@ static PyObject *_wrap_DC_GetTextExtent(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;

-    wxCoord *arg3 = (wxCoord *) 0 ;
-    wxCoord *arg4 = (wxCoord *) 0 ;
-    bool temp2 = false ;
-    wxCoord temp3 ;
-    wxCoord temp4 ;
+    int *arg3 = (int *) 0 ;
+    int *arg4 = (int *) 0 ;
+    bool temp2 = False ;
+    int temp3 ;
+    int temp4 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -11103,11 +12900,12 @@ static PyObject *_wrap_DC_GetTextExtent(PyObject *self, PyObject *args, PyObject
     arg3 = &temp3;
     arg4 = &temp4;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_GetTextExtent",kwnames,&obj0,&obj1)) goto fail;
     arg3 = &temp3;
     arg4 = &temp4;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_GetTextExtent",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -11143,16 +12941,16 @@ static PyObject *_wrap_DC_GetFullTextExtent(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;

-    wxCoord *arg3 = (wxCoord *) 0 ;
-    wxCoord *arg4 = (wxCoord *) 0 ;
-    wxCoord *arg5 = (wxCoord *) 0 ;
-    wxCoord *arg6 = (wxCoord *) 0 ;
+    int *arg3 = (int *) 0 ;
+    int *arg4 = (int *) 0 ;
+    int *arg5 = (int *) 0 ;
+    int *arg6 = (int *) 0 ;

     wxFont *arg7 = (wxFont *) NULL ;
     wxFont *arg7 = (wxFont *) NULL ;

-    bool temp2 = false ;
-    wxCoord temp3 ;
-    wxCoord temp4 ;
-    wxCoord temp5 ;
-    wxCoord temp6 ;
+    bool temp2 = False ;
+    int temp3 ;
+    int temp4 ;
+    int temp5 ;
+    int temp6 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;


@@ -11165,14 +12963,16 @@ static PyObject *_wrap_DC_GetFullTextExtent(PyObject *self, PyObject *args, PyOb
     arg5 = &temp5;
     arg6 = &temp6;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DC_GetFullTextExtent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     arg5 = &temp5;
     arg6 = &temp6;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DC_GetFullTextExtent",kwnames,&obj0,&obj1,&obj2)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     if (obj2) {
     }
     if (obj2) {

-        if ((SWIG_ConvertPtr(obj2,(void **) &arg7, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj2,(void **)(&arg7),SWIGTYPE_p_wxFont,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -11216,14 +13016,14 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;

-    wxCoord *arg3 = (wxCoord *) 0 ;
-    wxCoord *arg4 = (wxCoord *) 0 ;
-    wxCoord *arg5 = (wxCoord *) 0 ;
+    int *arg3 = (int *) 0 ;
+    int *arg4 = (int *) 0 ;
+    int *arg5 = (int *) 0 ;

     wxFont *arg6 = (wxFont *) NULL ;
     wxFont *arg6 = (wxFont *) NULL ;

-    bool temp2 = false ;
-    wxCoord temp3 ;
-    wxCoord temp4 ;
-    wxCoord temp5 ;
+    bool temp2 = False ;
+    int temp3 ;
+    int temp4 ;
+    int temp5 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;


@@ -11235,14 +13035,16 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args,
     arg4 = &temp4;
     arg5 = &temp5;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DC_GetMultiLineTextExtent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     arg4 = &temp4;
     arg5 = &temp5;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DC_GetMultiLineTextExtent",kwnames,&obj0,&obj1,&obj2)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;

-        temp2 = true;
+        temp2 = True;

     }
     if (obj2) {
     }
     if (obj2) {

-        if ((SWIG_ConvertPtr(obj2,(void **) &arg6, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj2,(void **)(&arg6),SWIGTYPE_p_wxFont,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -11278,40 +13080,52 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args,
 }
 
 
 }
 
 

-static PyObject *_wrap_DC_GetSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetPartialTextExtents(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    int *arg2 = (int *) 0 ;
-    int *arg3 = (int *) 0 ;
-    int temp2 ;
-    int temp3 ;
+    wxString *arg2 = 0 ;
+    wxArrayInt result;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self", NULL 
+        (char *) "self",(char *) "text", NULL 

     };
     
     };
     

-    arg2 = &temp2;
-    arg3 = &temp3;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSizeTuple",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_GetPartialTextExtents",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        arg2 = wxString_in_helper(obj1);
+        if (arg2 == NULL) SWIG_fail;
+        temp2 = True;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->GetSize(arg2,arg3);
+        result = wxDC_GetPartialTextExtents(arg1,(wxString const &)*arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    Py_INCREF(Py_None); resultobj = Py_None;

     {
     {

-        PyObject *o = PyInt_FromLong((long) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
+        resultobj = PyList_New(0);
+        size_t idx;
+        for (idx = 0; idx < (&result)->GetCount(); idx += 1) {
+            PyObject* val = PyInt_FromLong( (&result)->Item(idx) );
+            PyList_Append(resultobj, val);
+            Py_DECREF(val);
+        }

     }
     {
     }
     {

-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
+        if (temp2)
+        delete arg2;

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:

+    {
+        if (temp2)
+        delete arg2;
+    }

     return NULL;
 }
 
     return NULL;
 }
 


@@ -11326,7 +13140,8 @@ static PyObject *_wrap_DC_GetSize(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSize",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSize",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetSize();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (arg1)->GetSize();


@@ -11337,7 +13152,7 @@ static PyObject *_wrap_DC_GetSize(PyObject *self, PyObject *args, PyObject *kwar
     {
         wxSize * resultptr;
         resultptr = new wxSize((wxSize &) result);
     {
         wxSize * resultptr;
         resultptr = new wxSize((wxSize &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -11345,7 +13160,7 @@ static PyObject *_wrap_DC_GetSize(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
 }
 
 

-static PyObject *_wrap_DC_GetSizeMMWH(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int *arg2 = (int *) 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int *arg2 = (int *) 0 ;


@@ -11359,11 +13174,12 @@ static PyObject *_wrap_DC_GetSizeMMWH(PyObject *self, PyObject *args, PyObject *
     
     arg2 = &temp2;
     arg3 = &temp3;
     
     arg2 = &temp2;
     arg3 = &temp3;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSizeMMWH",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSizeTuple",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        ((wxDC const *)arg1)->GetSizeMM(arg2,arg3);
+        (arg1)->GetSize(arg2,arg3);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;


@@ -11393,7 +13209,8 @@ static PyObject *_wrap_DC_GetSizeMM(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSizeMM",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSizeMM",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxDC const *)arg1)->GetSizeMM();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxDC const *)arg1)->GetSizeMM();


@@ -11404,7 +13221,46 @@ static PyObject *_wrap_DC_GetSizeMM(PyObject *self, PyObject *args, PyObject *kw
     {
         wxSize * resultptr;
         resultptr = new wxSize((wxSize &) result);
     {
         wxSize * resultptr;
         resultptr = new wxSize((wxSize &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_DC_GetSizeMMTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxDC *arg1 = (wxDC *) 0 ;
+    int *arg2 = (int *) 0 ;
+    int *arg3 = (int *) 0 ;
+    int temp2 ;
+    int temp3 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    arg2 = &temp2;
+    arg3 = &temp3;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSizeMMTuple",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        ((wxDC const *)arg1)->GetSizeMM(arg2,arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        PyObject *o = PyInt_FromLong((long) (*arg2));
+        resultobj = t_output_helper(resultobj,o);
+    }
+    {
+        PyObject *o = PyInt_FromLong((long) (*arg3));
+        resultobj = t_output_helper(resultobj,o);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -11415,23 +13271,27 @@ static PyObject *_wrap_DC_GetSizeMM(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalX",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalX",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->DeviceToLogicalX(arg2);
+        result = (int)((wxDC const *)arg1)->DeviceToLogicalX(arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11441,23 +13301,27 @@ static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalY",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalY",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->DeviceToLogicalY(arg2);
+        result = (int)((wxDC const *)arg1)->DeviceToLogicalY(arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11467,23 +13331,27 @@ static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalXRel",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalXRel",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->DeviceToLogicalXRel(arg2);
+        result = (int)((wxDC const *)arg1)->DeviceToLogicalXRel(arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11493,23 +13361,27 @@ static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, Py
 static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalYRel",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalYRel",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->DeviceToLogicalYRel(arg2);
+        result = (int)((wxDC const *)arg1)->DeviceToLogicalYRel(arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11519,23 +13391,27 @@ static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, Py
 static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceX",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceX",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->LogicalToDeviceX(arg2);
+        result = (int)((wxDC const *)arg1)->LogicalToDeviceX(arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11545,23 +13421,27 @@ static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceY",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceY",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->LogicalToDeviceY(arg2);
+        result = (int)((wxDC const *)arg1)->LogicalToDeviceY(arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11571,23 +13451,27 @@ static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceXRel",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceXRel",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->LogicalToDeviceXRel(arg2);
+        result = (int)((wxDC const *)arg1)->LogicalToDeviceXRel(arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11597,23 +13481,27 @@ static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, Py
 static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceYRel",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceYRel",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->LogicalToDeviceYRel(arg2);
+        result = (int)((wxDC const *)arg1)->LogicalToDeviceYRel(arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11630,7 +13518,8 @@ static PyObject *_wrap_DC_CanDrawBitmap(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_CanDrawBitmap",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_CanDrawBitmap",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxDC const *)arg1)->CanDrawBitmap();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxDC const *)arg1)->CanDrawBitmap();


@@ -11638,7 +13527,9 @@ static PyObject *_wrap_DC_CanDrawBitmap(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11655,7 +13546,8 @@ static PyObject *_wrap_DC_CanGetTextExtent(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_CanGetTextExtent",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_CanGetTextExtent",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxDC const *)arg1)->CanGetTextExtent();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxDC const *)arg1)->CanGetTextExtent();


@@ -11663,7 +13555,9 @@ static PyObject *_wrap_DC_CanGetTextExtent(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11680,7 +13574,8 @@ static PyObject *_wrap_DC_GetDepth(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetDepth",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetDepth",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxDC const *)arg1)->GetDepth();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxDC const *)arg1)->GetDepth();


@@ -11688,7 +13583,7 @@ static PyObject *_wrap_DC_GetDepth(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11705,7 +13600,8 @@ static PyObject *_wrap_DC_GetPPI(PyObject *self, PyObject *args, PyObject *kwarg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetPPI",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetPPI",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxDC const *)arg1)->GetPPI();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxDC const *)arg1)->GetPPI();


@@ -11716,7 +13612,7 @@ static PyObject *_wrap_DC_GetPPI(PyObject *self, PyObject *args, PyObject *kwarg
     {
         wxSize * resultptr;
         resultptr = new wxSize((wxSize &) result);
     {
         wxSize * resultptr;
         resultptr = new wxSize((wxSize &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -11734,7 +13630,8 @@ static PyObject *_wrap_DC_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_Ok",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_Ok",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxDC const *)arg1)->Ok();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)((wxDC const *)arg1)->Ok();


@@ -11742,7 +13639,9 @@ static PyObject *_wrap_DC_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11759,7 +13658,8 @@ static PyObject *_wrap_DC_GetBackgroundMode(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetBackgroundMode",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetBackgroundMode",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxDC const *)arg1)->GetBackgroundMode();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxDC const *)arg1)->GetBackgroundMode();


@@ -11767,7 +13667,7 @@ static PyObject *_wrap_DC_GetBackgroundMode(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11784,7 +13684,8 @@ static PyObject *_wrap_DC_GetBackground(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetBackground",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetBackground",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {


@@ -11795,7 +13696,10 @@ static PyObject *_wrap_DC_GetBackground(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0);
+    {
+        wxBrush* resultptr = new wxBrush(*result);
+        resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBrush, 1);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11812,7 +13716,8 @@ static PyObject *_wrap_DC_GetBrush(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetBrush",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetBrush",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {


@@ -11823,7 +13728,10 @@ static PyObject *_wrap_DC_GetBrush(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0);
+    {
+        wxBrush* resultptr = new wxBrush(*result);
+        resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBrush, 1);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11840,7 +13748,8 @@ static PyObject *_wrap_DC_GetFont(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetFont",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetFont",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {


@@ -11851,7 +13760,10 @@ static PyObject *_wrap_DC_GetFont(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0);
+    {
+        wxFont* resultptr = new wxFont(*result);
+        resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxFont, 1);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11868,7 +13780,8 @@ static PyObject *_wrap_DC_GetPen(PyObject *self, PyObject *args, PyObject *kwarg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetPen",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetPen",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {


@@ -11879,7 +13792,10 @@ static PyObject *_wrap_DC_GetPen(PyObject *self, PyObject *args, PyObject *kwarg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0);
+    {
+        wxPen* resultptr = new wxPen(*result);
+        resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxPen, 1);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11896,7 +13812,8 @@ static PyObject *_wrap_DC_GetTextBackground(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetTextBackground",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetTextBackground",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {


@@ -11907,7 +13824,7 @@ static PyObject *_wrap_DC_GetTextBackground(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColour, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxColour, 0);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11924,7 +13841,8 @@ static PyObject *_wrap_DC_GetTextForeground(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetTextForeground",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetTextForeground",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {


@@ -11935,7 +13853,7 @@ static PyObject *_wrap_DC_GetTextForeground(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColour, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxColour, 0);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -11954,7 +13872,8 @@ static PyObject *_wrap_DC_SetTextForeground(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetTextForeground",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetTextForeground",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;


@@ -11985,7 +13904,8 @@ static PyObject *_wrap_DC_SetTextBackground(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetTextBackground",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetTextBackground",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;


@@ -12014,7 +13934,8 @@ static PyObject *_wrap_DC_GetMapMode(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetMapMode",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetMapMode",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxDC const *)arg1)->GetMapMode();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxDC const *)arg1)->GetMapMode();


@@ -12022,7 +13943,7 @@ static PyObject *_wrap_DC_GetMapMode(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -12034,12 +13955,16 @@ static PyObject *_wrap_DC_SetMapMode(PyObject *self, PyObject *args, PyObject *k
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "mode", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "mode", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_SetMapMode",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetMapMode",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetMapMode(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetMapMode(arg2);


@@ -12069,7 +13994,8 @@ static PyObject *_wrap_DC_GetUserScale(PyObject *self, PyObject *args, PyObject
     arg2 = &temp2;
     arg3 = &temp3;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetUserScale",kwnames,&obj0)) goto fail;
     arg2 = &temp2;
     arg3 = &temp3;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetUserScale",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         ((wxDC const *)arg1)->GetUserScale(arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         ((wxDC const *)arg1)->GetUserScale(arg2,arg3);


@@ -12098,12 +14024,19 @@ static PyObject *_wrap_DC_SetUserScale(PyObject *self, PyObject *args, PyObject
     double arg2 ;
     double arg3 ;
     PyObject * obj0 = 0 ;
     double arg2 ;
     double arg3 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:DC_SetUserScale",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetUserScale",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetUserScale(arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetUserScale(arg2,arg3);


@@ -12133,7 +14066,8 @@ static PyObject *_wrap_DC_GetLogicalScale(PyObject *self, PyObject *args, PyObje
     arg2 = &temp2;
     arg3 = &temp3;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetLogicalScale",kwnames,&obj0)) goto fail;
     arg2 = &temp2;
     arg3 = &temp3;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetLogicalScale",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->GetLogicalScale(arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->GetLogicalScale(arg2,arg3);


@@ -12162,12 +14096,19 @@ static PyObject *_wrap_DC_SetLogicalScale(PyObject *self, PyObject *args, PyObje
     double arg2 ;
     double arg3 ;
     PyObject * obj0 = 0 ;
     double arg2 ;
     double arg3 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:DC_SetLogicalScale",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetLogicalScale",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetLogicalScale(arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetLogicalScale(arg2,arg3);


@@ -12182,13 +14123,43 @@ static PyObject *_wrap_DC_SetLogicalScale(PyObject *self, PyObject *args, PyObje
 }
 
 
 }
 
 

+static PyObject *_wrap_DC_GetLogicalOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxDC *arg1 = (wxDC *) 0 ;
+    wxPoint result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetLogicalOrigin",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = ((wxDC const *)arg1)->GetLogicalOrigin();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        wxPoint * resultptr;
+        resultptr = new wxPoint((wxPoint &) result);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+

 static PyObject *_wrap_DC_GetLogicalOriginTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_GetLogicalOriginTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord *arg2 = (wxCoord *) 0 ;
-    wxCoord *arg3 = (wxCoord *) 0 ;
-    wxCoord temp2 ;
-    wxCoord temp3 ;
+    int *arg2 = (int *) 0 ;
+    int *arg3 = (int *) 0 ;
+    int temp2 ;
+    int temp3 ;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 


@@ -12197,7 +14168,8 @@ static PyObject *_wrap_DC_GetLogicalOriginTuple(PyObject *self, PyObject *args,
     arg2 = &temp2;
     arg3 = &temp3;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetLogicalOriginTuple",kwnames,&obj0)) goto fail;
     arg2 = &temp2;
     arg3 = &temp3;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetLogicalOriginTuple",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         ((wxDC const *)arg1)->GetLogicalOrigin(arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         ((wxDC const *)arg1)->GetLogicalOrigin(arg2,arg3);


@@ -12220,55 +14192,63 @@ static PyObject *_wrap_DC_GetLogicalOriginTuple(PyObject *self, PyObject *args,
 }
 
 
 }
 
 

-static PyObject *_wrap_DC_GetLogicalOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxPoint result;
+    int arg2 ;
+    int arg3 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self", NULL 
+        (char *) "self",(char *) "x",(char *) "y", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetLogicalOrigin",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetLogicalOrigin",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = ((wxDC const *)arg1)->GetLogicalOrigin();
+        (arg1)->SetLogicalOrigin(arg2,arg3);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    {
-        wxPoint * resultptr;
-        resultptr = new wxPoint((wxPoint &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1);
-    }
+    Py_INCREF(Py_None); resultobj = Py_None;

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetDeviceOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    wxPoint result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     char *kwnames[] = {

-        (char *) "self",(char *) "x",(char *) "y", NULL 
+        (char *) "self", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:DC_SetLogicalOrigin",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetDeviceOrigin",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->SetLogicalOrigin(arg2,arg3);
+        result = ((wxDC const *)arg1)->GetDeviceOrigin();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        wxPoint * resultptr;
+        resultptr = new wxPoint((wxPoint &) result);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -12278,10 +14258,10 @@ static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_DC_GetDeviceOriginTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_GetDeviceOriginTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord *arg2 = (wxCoord *) 0 ;
-    wxCoord *arg3 = (wxCoord *) 0 ;
-    wxCoord temp2 ;
-    wxCoord temp3 ;
+    int *arg2 = (int *) 0 ;
+    int *arg3 = (int *) 0 ;
+    int temp2 ;
+    int temp3 ;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 


@@ -12290,7 +14270,8 @@ static PyObject *_wrap_DC_GetDeviceOriginTuple(PyObject *self, PyObject *args, P
     arg2 = &temp2;
     arg3 = &temp3;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetDeviceOriginTuple",kwnames,&obj0)) goto fail;
     arg2 = &temp2;
     arg3 = &temp3;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetDeviceOriginTuple",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         ((wxDC const *)arg1)->GetDeviceOrigin(arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         ((wxDC const *)arg1)->GetDeviceOrigin(arg2,arg3);


@@ -12313,47 +14294,25 @@ static PyObject *_wrap_DC_GetDeviceOriginTuple(PyObject *self, PyObject *args, P
 }
 
 
 }
 
 

-static PyObject *_wrap_DC_GetDeviceOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetDeviceOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxPoint result;
+    int arg2 ;
+    int arg3 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self", NULL 
+        (char *) "self",(char *) "x",(char *) "y", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetDeviceOrigin",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxDC const *)arg1)->GetDeviceOrigin();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    {
-        wxPoint * resultptr;
-        resultptr = new wxPoint((wxPoint &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1);
-    }
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_DC_SetDeviceOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "x",(char *) "y", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:DC_SetDeviceOrigin",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetDeviceOrigin",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetDeviceOrigin(arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetDeviceOrigin(arg2,arg3);


@@ -12381,10 +14340,11 @@ static PyObject *_wrap_DC_SetAxisOrientation(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetAxisOrientation",kwnames,&obj0,&obj1,&obj2)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetAxisOrientation",kwnames,&obj0,&obj1,&obj2)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     if (PyErr_Occurred()) SWIG_fail;

-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    arg3 = (bool) SWIG_AsBool(obj2); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -12410,7 +14370,8 @@ static PyObject *_wrap_DC_GetLogicalFunction(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetLogicalFunction",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetLogicalFunction",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxDC const *)arg1)->GetLogicalFunction();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)((wxDC const *)arg1)->GetLogicalFunction();


@@ -12418,7 +14379,7 @@ static PyObject *_wrap_DC_GetLogicalFunction(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -12430,12 +14391,16 @@ static PyObject *_wrap_DC_SetLogicalFunction(PyObject *self, PyObject *args, PyO
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "function", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "function", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_SetLogicalFunction",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetLogicalFunction",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetLogicalFunction(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetLogicalFunction(arg2);


@@ -12461,8 +14426,9 @@ static PyObject *_wrap_DC_SetOptimization(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetOptimization",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetOptimization",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -12488,7 +14454,8 @@ static PyObject *_wrap_DC_GetOptimization(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetOptimization",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetOptimization",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetOptimization();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->GetOptimization();


@@ -12496,7 +14463,9 @@ static PyObject *_wrap_DC_GetOptimization(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -12506,15 +14475,22 @@ static PyObject *_wrap_DC_GetOptimization(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_DC_CalcBoundingBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_CalcBoundingBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:DC_CalcBoundingBox",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_CalcBoundingBox",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->CalcBoundingBox(arg2,arg3);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->CalcBoundingBox(arg2,arg3);


@@ -12538,7 +14514,8 @@ static PyObject *_wrap_DC_ResetBoundingBox(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_ResetBoundingBox",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_ResetBoundingBox",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->ResetBoundingBox();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->ResetBoundingBox();


@@ -12556,22 +14533,23 @@ static PyObject *_wrap_DC_ResetBoundingBox(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_DC_MinX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_MinX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord result;
+    int result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_MinX",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_MinX",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->MinX();
+        result = (int)((wxDC const *)arg1)->MinX();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -12581,22 +14559,23 @@ static PyObject *_wrap_DC_MinX(PyObject *self, PyObject *args, PyObject *kwargs)
 static PyObject *_wrap_DC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord result;
+    int result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_MaxX",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_MaxX",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->MaxX();
+        result = (int)((wxDC const *)arg1)->MaxX();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -12606,22 +14585,23 @@ static PyObject *_wrap_DC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs)
 static PyObject *_wrap_DC_MinY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_MinY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord result;
+    int result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_MinY",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_MinY",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->MinY();
+        result = (int)((wxDC const *)arg1)->MinY();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -12631,22 +14611,23 @@ static PyObject *_wrap_DC_MinY(PyObject *self, PyObject *args, PyObject *kwargs)
 static PyObject *_wrap_DC_MaxY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_DC_MaxY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxCoord result;
+    int result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_MaxY",kwnames,&obj0)) goto fail;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_MaxY",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxCoord)((wxDC const *)arg1)->MaxY();
+        result = (int)((wxDC const *)arg1)->MaxY();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -12674,7 +14655,8 @@ static PyObject *_wrap_DC_GetBoundingBox(PyObject *self, PyObject *args, PyObjec
     arg4 = &temp4;
     arg5 = &temp5;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetBoundingBox",kwnames,&obj0)) goto fail;
     arg4 = &temp4;
     arg5 = &temp5;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetBoundingBox",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxDC_GetBoundingBox(arg1,arg2,arg3,arg4,arg5);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxDC_GetBoundingBox(arg1,arg2,arg3,arg4,arg5);


@@ -12721,7 +14703,8 @@ static PyObject *_wrap_DC__DrawPointList(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawPointList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawPointList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     arg2 = obj1;
     arg3 = obj2;
     arg4 = obj3;
     arg2 = obj1;
     arg3 = obj2;
     arg4 = obj3;


@@ -12755,7 +14738,8 @@ static PyObject *_wrap_DC__DrawLineList(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawLineList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawLineList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     arg2 = obj1;
     arg3 = obj2;
     arg4 = obj3;
     arg2 = obj1;
     arg3 = obj2;
     arg4 = obj3;


@@ -12789,7 +14773,8 @@ static PyObject *_wrap_DC__DrawRectangleList(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawRectangleList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawRectangleList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     arg2 = obj1;
     arg3 = obj2;
     arg4 = obj3;
     arg2 = obj1;
     arg3 = obj2;
     arg4 = obj3;


@@ -12823,7 +14808,8 @@ static PyObject *_wrap_DC__DrawEllipseList(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawEllipseList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawEllipseList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     arg2 = obj1;
     arg3 = obj2;
     arg4 = obj3;
     arg2 = obj1;
     arg3 = obj2;
     arg4 = obj3;


@@ -12857,7 +14843,8 @@ static PyObject *_wrap_DC__DrawPolygonList(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawPolygonList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawPolygonList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     arg2 = obj1;
     arg3 = obj2;
     arg4 = obj3;
     arg2 = obj1;
     arg3 = obj2;
     arg4 = obj3;


@@ -12893,7 +14880,8 @@ static PyObject *_wrap_DC__DrawTextList(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC__DrawTextList",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC__DrawTextList",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     arg2 = obj1;
     arg3 = obj2;
     arg4 = obj3;
     arg2 = obj1;
     arg3 = obj2;
     arg4 = obj3;


@@ -12934,7 +14922,7 @@ static PyObject *_wrap_new_MemoryDC(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMemoryDC, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMemoryDC, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -12951,7 +14939,8 @@ static PyObject *_wrap_new_MemoryDCFromDC(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_MemoryDCFromDC",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_MemoryDCFromDC",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxMemoryDC *)new wxMemoryDC(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxMemoryDC *)new wxMemoryDC(arg1);


@@ -12959,7 +14948,7 @@ static PyObject *_wrap_new_MemoryDCFromDC(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMemoryDC, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMemoryDC, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -12977,10 +14966,14 @@ static PyObject *_wrap_MemoryDC_SelectObject(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObject",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObject",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMemoryDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMemoryDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -13003,22 +14996,23 @@ static PyObject * MemoryDC_swigregister(PyObject *self, PyObject *args) {
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }

-static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *self, PyObject *args) {

     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxBitmap *arg2 = 0 ;
     wxBufferedDC *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxBitmap *arg2 = 0 ;
     wxBufferedDC *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

-    char *kwnames[] = {
-        (char *) "dc",(char *) "buffer", NULL 
-    };

     
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_BufferedDC",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -13027,14 +15021,14 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBufferedDC, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBufferedDC, 1);

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *self, PyObject *args) {

     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxSize *arg2 = 0 ;
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxSize *arg2 = 0 ;


@@ -13042,12 +15036,101 @@ static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *ar
     wxSize temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     wxSize temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

-    char *kwnames[] = {
-        (char *) "dc",(char *) "area", NULL 
-    };

     
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_BufferedDCInternalBuffer",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        arg2 = &temp2;
+        if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBufferedDC, 1);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
+    int argc;
+    PyObject *argv[3];
+    int ii;
+    
+    argc = PyObject_Length(args);
+    for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+        argv[ii] = PyTuple_GetItem(args,ii);
+    }
+    if (argc == 2) {
+        int _v;
+        {
+            void *ptr;
+            if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxDC, 0) == -1) {
+                _v = 0;
+                PyErr_Clear();
+            } else {
+                _v = 1;
+            }
+        }
+        if (_v) {
+            {
+                void *ptr;
+                if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) {
+                    _v = 0;
+                    PyErr_Clear();
+                } else {
+                    _v = 1;
+                }
+            }
+            if (_v) {
+                return _wrap_new_BufferedDC__SWIG_0(self,args);
+            }
+        }
+    }
+    if (argc == 2) {
+        int _v;
+        {
+            void *ptr;
+            if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxDC, 0) == -1) {
+                _v = 0;
+                PyErr_Clear();
+            } else {
+                _v = 1;
+            }
+        }
+        if (_v) {
+            {
+                _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2);
+            }
+            if (_v) {
+                return _wrap_new_BufferedDC__SWIG_1(self,args);
+            }
+        }
+    }
+    
+    PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_BufferedDC'");
+    return NULL;
+}
+
+
+static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *args) {
+    PyObject *resultobj;
+    wxDC *arg1 = (wxDC *) 0 ;
+    wxSize *arg2 = 0 ;
+    wxBufferedDC *result;
+    wxSize temp2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDCInternalBuffer",&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;


@@ -13059,7 +15142,32 @@ static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBufferedDC, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBufferedDC, 1);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_delete_BufferedDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxBufferedDC *arg1 = (wxBufferedDC *) 0 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_BufferedDC",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBufferedDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        delete arg1;
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13075,7 +15183,8 @@ static PyObject *_wrap_BufferedDC_UnMask(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BufferedDC_UnMask",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BufferedDC_UnMask",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBufferedDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBufferedDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->UnMask();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->UnMask();


@@ -13110,11 +15219,15 @@ static PyObject *_wrap_new_BufferedPaintDC(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BufferedPaintDC",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BufferedPaintDC",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     if (obj1) {
     if (obj1) {

-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
+        SWIG_POINTER_EXCEPTION | 0)) == -1)
+        SWIG_fail;

         if (arg2 == NULL) {
         if (arg2 == NULL) {

-            PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+            PyErr_SetString(PyExc_TypeError,"null reference");
+            SWIG_fail;

         }
     }
     {
         }
     }
     {


@@ -13124,7 +15237,7 @@ static PyObject *_wrap_new_BufferedPaintDC(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBufferedPaintDC, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBufferedPaintDC, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13153,7 +15266,7 @@ static PyObject *_wrap_new_ScreenDC(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxScreenDC, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScreenDC, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13172,8 +15285,10 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTopWin(PyObject *self, PyObject *a
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScreenDC_StartDrawingOnTopWin",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScreenDC_StartDrawingOnTopWin",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScreenDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScreenDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->StartDrawingOnTop(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->StartDrawingOnTop(arg2);


@@ -13181,7 +15296,9 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTopWin(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13200,9 +15317,11 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTop(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ScreenDC_StartDrawingOnTop",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ScreenDC_StartDrawingOnTop",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScreenDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScreenDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     if (obj1) {
     if (obj1) {

-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxRect,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -13211,7 +15330,9 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTop(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13228,7 +15349,8 @@ static PyObject *_wrap_ScreenDC_EndDrawingOnTop(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ScreenDC_EndDrawingOnTop",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ScreenDC_EndDrawingOnTop",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScreenDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScreenDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->EndDrawingOnTop();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->EndDrawingOnTop();


@@ -13236,7 +15358,9 @@ static PyObject *_wrap_ScreenDC_EndDrawingOnTop(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13260,7 +15384,8 @@ static PyObject *_wrap_new_ClientDC(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_ClientDC",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_ClientDC",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxClientDC *)new wxClientDC(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxClientDC *)new wxClientDC(arg1);


@@ -13268,7 +15393,7 @@ static PyObject *_wrap_new_ClientDC(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxClientDC, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxClientDC, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13292,7 +15417,8 @@ static PyObject *_wrap_new_PaintDC(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PaintDC",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PaintDC",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPaintDC *)new wxPaintDC(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPaintDC *)new wxPaintDC(arg1);


@@ -13300,7 +15426,7 @@ static PyObject *_wrap_new_PaintDC(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPaintDC, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPaintDC, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13324,7 +15450,8 @@ static PyObject *_wrap_new_WindowDC(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_WindowDC",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_WindowDC",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxWindowDC *)new wxWindowDC(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxWindowDC *)new wxWindowDC(arg1);


@@ -13332,7 +15459,7 @@ static PyObject *_wrap_new_WindowDC(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxWindowDC, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindowDC, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13358,11 +15485,14 @@ static PyObject *_wrap_new_MirrorDC(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_MirrorDC",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_MirrorDC",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     }

-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    arg2 = (bool) SWIG_AsBool(obj1); 

     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -13371,7 +15501,7 @@ static PyObject *_wrap_new_MirrorDC(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMirrorDC, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMirrorDC, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13395,9 +15525,12 @@ static PyObject *_wrap_new_PostScriptDC(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PostScriptDC",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PostScriptDC",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -13406,7 +15539,7 @@ static PyObject *_wrap_new_PostScriptDC(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPostScriptDC, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPostScriptDC, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13423,7 +15556,8 @@ static PyObject *_wrap_PostScriptDC_GetPrintData(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PostScriptDC_GetPrintData",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PostScriptDC_GetPrintData",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPostScriptDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPostScriptDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         {


@@ -13434,7 +15568,7 @@ static PyObject *_wrap_PostScriptDC_GetPrintData(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPrintData, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPrintData, 0);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13452,10 +15586,14 @@ static PyObject *_wrap_PostScriptDC_SetPrintData(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PostScriptDC_SetPrintData",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PostScriptDC_SetPrintData",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPostScriptDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPostScriptDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPrintData,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -13474,11 +15612,14 @@ static PyObject *_wrap_PostScriptDC_SetPrintData(PyObject *self, PyObject *args,
 static PyObject *_wrap_PostScriptDC_SetResolution(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
 static PyObject *_wrap_PostScriptDC_SetResolution(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;

+    PyObject * obj0 = 0 ;

     char *kwnames[] = {
         (char *) "ppi", NULL 
     };
     
     char *kwnames[] = {
         (char *) "ppi", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:PostScriptDC_SetResolution",kwnames,&arg1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PostScriptDC_SetResolution",kwnames,&obj0)) goto fail;
+    arg1 = (int) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxPostScriptDC::SetResolution(arg1);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         wxPostScriptDC::SetResolution(arg1);


@@ -13508,7 +15649,7 @@ static PyObject *_wrap_PostScriptDC_GetResolution(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13527,7 +15668,7 @@ static PyObject *_wrap_new_MetaFile(PyObject *self, PyObject *args, PyObject *kw
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
     wxMetaFile *result;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
     wxMetaFile *result;

-    bool temp1 = false ;
+    bool temp1 = False ;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "filename", NULL 
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "filename", NULL 


@@ -13538,7 +15679,7 @@ static PyObject *_wrap_new_MetaFile(PyObject *self, PyObject *args, PyObject *kw
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;

-            temp1 = true;
+            temp1 = True;

         }
     }
     {
         }
     }
     {


@@ -13548,7 +15689,7 @@ static PyObject *_wrap_new_MetaFile(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMetaFile, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMetaFile, 1);

     {
         if (temp1)
         delete arg1;
     {
         if (temp1)
         delete arg1;


@@ -13579,27 +15720,37 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *self, PyObject *args, PyObject *
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     wxMetaFileDC *result;
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     wxMetaFileDC *result;

-    bool temp1 = false ;
-    bool temp4 = false ;
+    bool temp1 = False ;
+    bool temp4 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     PyObject * obj3 = 0 ;
     char *kwnames[] = {
         (char *) "filename",(char *) "width",(char *) "height",(char *) "description", NULL 
     };
     
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
         (char *) "filename",(char *) "width",(char *) "height",(char *) "description", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OiiO:new_MetaFileDC",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_MetaFileDC",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

     if (obj0) {
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
     if (obj0) {
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;

-            temp1 = true;
+            temp1 = True;

         }
     }
         }
     }

+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;

-            temp4 = true;
+            temp4 = True;

         }
     }
     {
         }
     }
     {


@@ -13609,7 +15760,7 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMetaFileDC, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMetaFileDC, 1);

     {
         if (temp1)
         delete arg1;
     {
         if (temp1)
         delete arg1;


@@ -13649,9 +15800,12 @@ static PyObject *_wrap_new_PrinterDC(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PrinterDC",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PrinterDC",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg1 == NULL) {
     if (arg1 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -13660,7 +15814,7 @@ static PyObject *_wrap_new_PrinterDC(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPrinterDC, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPrinterDC, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13678,14 +15832,30 @@ static PyObject *_wrap_new_ImageList(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     int arg1 ;
     int arg2 ;
     PyObject *resultobj;
     int arg1 ;
     int arg2 ;

-    int arg3 = (int) TRUE ;
+    int arg3 = (int) True ;

     int arg4 = (int) 1 ;
     wxImageList *result;
     int arg4 = (int) 1 ;
     wxImageList *result;

+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
         (char *) "width",(char *) "height",(char *) "mask",(char *) "initialCount", NULL 
     };
     
     char *kwnames[] = {
         (char *) "width",(char *) "height",(char *) "mask",(char *) "initialCount", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii|ii:new_ImageList",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_ImageList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    arg1 = (int) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxImageList *)new wxImageList(arg1,arg2,arg3,arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxImageList *)new wxImageList(arg1,arg2,arg3,arg4);


@@ -13711,7 +15881,8 @@ static PyObject *_wrap_delete_ImageList(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ImageList",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ImageList",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         delete arg1;


@@ -13741,15 +15912,22 @@ static PyObject *_wrap_ImageList_Add(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ImageList_Add",kwnames,&obj0,&obj1,&obj2)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ImageList_Add",kwnames,&obj0,&obj1,&obj2)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     if (obj2) {
     }
     if (obj2) {

-        if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxBitmap,
+        SWIG_POINTER_EXCEPTION | 0)) == -1)
+        SWIG_fail;

         if (arg3 == NULL) {
         if (arg3 == NULL) {

-            PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+            PyErr_SetString(PyExc_TypeError,"null reference");
+            SWIG_fail;

         }
     }
     {
         }
     }
     {


@@ -13759,7 +15937,7 @@ static PyObject *_wrap_ImageList_Add(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13781,10 +15959,14 @@ static PyObject *_wrap_ImageList_AddWithColourMask(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageList_AddWithColourMask",kwnames,&obj0,&obj1,&obj2)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageList_AddWithColourMask",kwnames,&obj0,&obj1,&obj2)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         arg3 = &temp3;
     }
     {
         arg3 = &temp3;


@@ -13797,7 +15979,7 @@ static PyObject *_wrap_ImageList_AddWithColourMask(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13816,10 +15998,14 @@ static PyObject *_wrap_ImageList_AddIcon(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_AddIcon",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_AddIcon",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxIcon,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -13828,7 +16014,7 @@ static PyObject *_wrap_ImageList_AddIcon(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13842,16 +16028,23 @@ static PyObject *_wrap_ImageList_Replace(PyObject *self, PyObject *args, PyObjec
     wxBitmap *arg3 = 0 ;
     bool result;
     PyObject * obj0 = 0 ;
     wxBitmap *arg3 = 0 ;
     bool result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     PyObject * obj2 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "index",(char *) "bitmap", NULL 
     };
     
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "index",(char *) "bitmap", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ImageList_Replace",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageList_Replace",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg3 == NULL) {
     if (arg3 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -13860,7 +16053,9 @@ static PyObject *_wrap_ImageList_Replace(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13875,23 +16070,41 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject *
     int arg4 ;
     int arg5 ;
     int arg6 = (int) wxIMAGELIST_DRAW_NORMAL ;
     int arg4 ;
     int arg5 ;
     int arg6 = (int) wxIMAGELIST_DRAW_NORMAL ;

-    bool arg7 = (bool) (bool)FALSE ;
+    bool arg7 = (bool) (bool)False ;

     bool result;
     PyObject * obj0 = 0 ;
     bool result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     PyObject * obj2 = 0 ;
     PyObject * obj2 = 0 ;

+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;

     PyObject * obj6 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "index",(char *) "dc",(char *) "x",(char *) "x",(char *) "flags",(char *) "solidBackground", NULL 
     };
     
     PyObject * obj6 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "index",(char *) "dc",(char *) "x",(char *) "x",(char *) "flags",(char *) "solidBackground", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOii|iO:ImageList_Draw",kwnames,&obj0,&arg2,&obj2,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:ImageList_Draw",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg3 == NULL) {
     if (arg3 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
+    }
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;

     }
     if (obj6) {
     }
     if (obj6) {

-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool const) SWIG_AsBool(obj6); 

         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {


@@ -13901,7 +16114,9 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13918,7 +16133,8 @@ static PyObject *_wrap_ImageList_GetImageCount(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageList_GetImageCount",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageList_GetImageCount",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetImageCount();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (int)(arg1)->GetImageCount();


@@ -13926,7 +16142,7 @@ static PyObject *_wrap_ImageList_GetImageCount(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13939,12 +16155,16 @@ static PyObject *_wrap_ImageList_Remove(PyObject *self, PyObject *args, PyObject
     int arg2 ;
     bool result;
     PyObject * obj0 = 0 ;
     int arg2 ;
     bool result;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "index", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "index", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ImageList_Remove",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_Remove",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Remove(arg2);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->Remove(arg2);


@@ -13952,7 +16172,9 @@ static PyObject *_wrap_ImageList_Remove(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13969,7 +16191,8 @@ static PyObject *_wrap_ImageList_RemoveAll(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageList_RemoveAll",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageList_RemoveAll",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->RemoveAll();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (bool)(arg1)->RemoveAll();


@@ -13977,7 +16200,9 @@ static PyObject *_wrap_ImageList_RemoveAll(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -13993,14 +16218,18 @@ static PyObject *_wrap_ImageList_GetSize(PyObject *self, PyObject *args, PyObjec
     int temp3 ;
     int temp4 ;
     PyObject * obj0 = 0 ;
     int temp3 ;
     int temp4 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "index", NULL 
     };
     
     arg3 = &temp3;
     arg4 = &temp4;
     char *kwnames[] = {
         (char *) "self",(char *) "index", NULL 
     };
     
     arg3 = &temp3;
     arg4 = &temp4;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ImageList_GetSize",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_GetSize",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->GetSize(arg2,*arg3,*arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->GetSize(arg2,*arg3,*arg4);


@@ -14030,623 +16259,17 @@ static PyObject * ImageList_swigregister(PyObject *self, PyObject *args) {
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }

-static PyObject *_wrap_PenList_AddPen(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxPenList *arg1 = (wxPenList *) 0 ;
-    wxPen *arg2 = (wxPen *) 0 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "pen", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_AddPen",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->AddPen(arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    return resultobj;
-    fail:
-    return NULL;
+static int _wrap_NORMAL_FONT_set(PyObject *_val) {
+    PyErr_SetString(PyExc_TypeError,"Variable NORMAL_FONT is read-only.");
+    return 1;

 }
 
 
 }
 
 

-static PyObject *_wrap_PenList_FindOrCreatePen(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxPenList *arg1 = (wxPenList *) 0 ;
-    wxColour *arg2 = 0 ;
-    int arg3 ;
-    int arg4 ;
-    wxPen *result;
-    wxColour temp2 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "colour",(char *) "width",(char *) "style", NULL 
-    };
+static PyObject *_wrap_NORMAL_FONT_get() {
+    PyObject *pyobj;

     
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:PenList_FindOrCreatePen",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = &temp2;
-        if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxPen *)(arg1)->FindOrCreatePen((wxColour const &)*arg2,arg3,arg4);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_PenList_RemovePen(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxPenList *arg1 = (wxPenList *) 0 ;
-    wxPen *arg2 = (wxPen *) 0 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "pen", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_RemovePen",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->RemovePen(arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_PenList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxPenList *arg1 = (wxPenList *) 0 ;
-    int result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PenList_GetCount",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (int)(arg1)->GetCount();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject * PenList_swigregister(PyObject *self, PyObject *args) {
-    PyObject *obj;
-    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
-    SWIG_TypeClientData(SWIGTYPE_p_wxPenList, obj);
-    Py_INCREF(obj);
-    return Py_BuildValue((char *)"");
-}
-static PyObject *_wrap_BrushList_AddBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxBrushList *arg1 = (wxBrushList *) 0 ;
-    wxBrush *arg2 = (wxBrush *) 0 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "brush", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_AddBrush",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->AddBrush(arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxBrushList *arg1 = (wxBrushList *) 0 ;
-    wxColour *arg2 = 0 ;
-    int arg3 ;
-    wxBrush *result;
-    wxColour temp2 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "colour",(char *) "style", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = &temp2;
-        if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxBrush *)(arg1)->FindOrCreateBrush((wxColour const &)*arg2,arg3);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_BrushList_RemoveBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxBrushList *arg1 = (wxBrushList *) 0 ;
-    wxBrush *arg2 = (wxBrush *) 0 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "brush", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_RemoveBrush",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->RemoveBrush(arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_BrushList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxBrushList *arg1 = (wxBrushList *) 0 ;
-    int result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BrushList_GetCount",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (int)(arg1)->GetCount();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject * BrushList_swigregister(PyObject *self, PyObject *args) {
-    PyObject *obj;
-    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
-    SWIG_TypeClientData(SWIGTYPE_p_wxBrushList, obj);
-    Py_INCREF(obj);
-    return Py_BuildValue((char *)"");
-}
-static PyObject *_wrap_new_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxColourDatabase *result;
-    char *kwnames[] = {
-        NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_ColourDatabase",kwnames)) goto fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxColourDatabase *)new wxColourDatabase();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColourDatabase, 1);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_delete_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ColourDatabase",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        delete arg1;
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_ColourDatabase_Find(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
-    wxString *arg2 = 0 ;
-    wxColour result;
-    bool temp2 = false ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "name", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_Find",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = wxString_in_helper(obj1);
-        if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxColourDatabase const *)arg1)->Find((wxString const &)*arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    {
-        wxColour * resultptr;
-        resultptr = new wxColour((wxColour &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
-    }
-    {
-        if (temp2)
-        delete arg2;
-    }
-    return resultobj;
-    fail:
-    {
-        if (temp2)
-        delete arg2;
-    }
-    return NULL;
-}
-
-
-static PyObject *_wrap_ColourDatabase_FindName(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
-    wxColour *arg2 = 0 ;
-    wxString result;
-    wxColour temp2 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "colour", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_FindName",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = &temp2;
-        if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxColourDatabase const *)arg1)->FindName((wxColour const &)*arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    {
-#if wxUSE_UNICODE
-        resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-        resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
-    }
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
-    wxString *arg2 = 0 ;
-    wxColour *arg3 = 0 ;
-    bool temp2 = false ;
-    wxColour temp3 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    PyObject * obj2 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "name",(char *) "colour", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourDatabase_AddColour",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = wxString_in_helper(obj1);
-        if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
-    }
-    {
-        arg3 = &temp3;
-        if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->AddColour((wxString const &)*arg2,(wxColour const &)*arg3);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        if (temp2)
-        delete arg2;
-    }
-    return resultobj;
-    fail:
-    {
-        if (temp2)
-        delete arg2;
-    }
-    return NULL;
-}
-
-
-static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
-    wxString *arg2 = 0 ;
-    int arg3 ;
-    int arg4 ;
-    int arg5 ;
-    bool temp2 = false ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "name",(char *) "red",(char *) "green",(char *) "blue", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiii:ColourDatabase_Append",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = wxString_in_helper(obj1);
-        if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxColourDatabase_Append(arg1,(wxString const &)*arg2,arg3,arg4,arg5);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        if (temp2)
-        delete arg2;
-    }
-    return resultobj;
-    fail:
-    {
-        if (temp2)
-        delete arg2;
-    }
-    return NULL;
-}
-
-
-static PyObject * ColourDatabase_swigregister(PyObject *self, PyObject *args) {
-    PyObject *obj;
-    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
-    SWIG_TypeClientData(SWIGTYPE_p_wxColourDatabase, obj);
-    Py_INCREF(obj);
-    return Py_BuildValue((char *)"");
-}
-static PyObject *_wrap_FontList_AddFont(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxFontList *arg1 = (wxFontList *) 0 ;
-    wxFont *arg2 = (wxFont *) 0 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "font", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_AddFont",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->AddFont(arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxFontList *arg1 = (wxFontList *) 0 ;
-    int arg2 ;
-    int arg3 ;
-    int arg4 ;
-    int arg5 ;
-    bool arg6 = (bool) FALSE ;
-    wxString const &arg7_defvalue = wxPyEmptyString ;
-    wxString *arg7 = (wxString *) &arg7_defvalue ;
-    int arg8 = (int) wxFONTENCODING_DEFAULT ;
-    wxFont *result;
-    bool temp7 = false ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj5 = 0 ;
-    PyObject * obj6 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "point_size",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "facename",(char *) "encoding", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|OOi:FontList_FindOrCreateFont",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&obj6,&arg8)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (obj5) {
-        arg6 = PyInt_AsLong(obj5) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    if (obj6) {
-        {
-            arg7 = wxString_in_helper(obj6);
-            if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
-        }
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxFont *)(arg1)->FindOrCreateFont(arg2,arg3,arg4,arg5,arg6,(wxString const &)*arg7,(wxFontEncoding )arg8);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0);
-    {
-        if (temp7)
-        delete arg7;
-    }
-    return resultobj;
-    fail:
-    {
-        if (temp7)
-        delete arg7;
-    }
-    return NULL;
-}
-
-
-static PyObject *_wrap_FontList_RemoveFont(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxFontList *arg1 = (wxFontList *) 0 ;
-    wxFont *arg2 = (wxFont *) 0 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "font", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_RemoveFont",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->RemoveFont(arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_FontList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxFontList *arg1 = (wxFontList *) 0 ;
-    int result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontList_GetCount",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (int)(arg1)->GetCount();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject * FontList_swigregister(PyObject *self, PyObject *args) {
-    PyObject *obj;
-    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
-    SWIG_TypeClientData(SWIGTYPE_p_wxFontList, obj);
-    Py_INCREF(obj);
-    return Py_BuildValue((char *)"");
-}
-static int _wrap_NORMAL_FONT_set(PyObject *_val) {
-    PyErr_SetString(PyExc_TypeError,"Variable NORMAL_FONT is read-only.");
-    return 1;
-}
-
-
-static PyObject *_wrap_NORMAL_FONT_get() {
-    PyObject *pyobj;
-    
-    pyobj = SWIG_NewPointerObj((void *) wxNORMAL_FONT, SWIGTYPE_p_wxFont, 0);
-    return pyobj;
+    pyobj = SWIG_NewPointerObj((void *)(wxNORMAL_FONT), SWIGTYPE_p_wxFont, 0);
+    return pyobj;

 }
 
 
 }
 
 


@@ -14659,7 +16282,7 @@ static int _wrap_SMALL_FONT_set(PyObject *_val) {
 static PyObject *_wrap_SMALL_FONT_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_SMALL_FONT_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxSMALL_FONT, SWIGTYPE_p_wxFont, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxSMALL_FONT), SWIGTYPE_p_wxFont, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14673,7 +16296,7 @@ static int _wrap_ITALIC_FONT_set(PyObject *_val) {
 static PyObject *_wrap_ITALIC_FONT_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_ITALIC_FONT_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxITALIC_FONT, SWIGTYPE_p_wxFont, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxITALIC_FONT), SWIGTYPE_p_wxFont, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14687,7 +16310,7 @@ static int _wrap_SWISS_FONT_set(PyObject *_val) {
 static PyObject *_wrap_SWISS_FONT_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_SWISS_FONT_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxSWISS_FONT, SWIGTYPE_p_wxFont, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxSWISS_FONT), SWIGTYPE_p_wxFont, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14701,7 +16324,7 @@ static int _wrap_RED_PEN_set(PyObject *_val) {
 static PyObject *_wrap_RED_PEN_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_RED_PEN_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxRED_PEN, SWIGTYPE_p_wxPen, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxRED_PEN), SWIGTYPE_p_wxPen, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14715,7 +16338,7 @@ static int _wrap_CYAN_PEN_set(PyObject *_val) {
 static PyObject *_wrap_CYAN_PEN_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_CYAN_PEN_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxCYAN_PEN, SWIGTYPE_p_wxPen, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxCYAN_PEN), SWIGTYPE_p_wxPen, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14729,7 +16352,7 @@ static int _wrap_GREEN_PEN_set(PyObject *_val) {
 static PyObject *_wrap_GREEN_PEN_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_GREEN_PEN_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxGREEN_PEN, SWIGTYPE_p_wxPen, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxGREEN_PEN), SWIGTYPE_p_wxPen, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14743,7 +16366,7 @@ static int _wrap_BLACK_PEN_set(PyObject *_val) {
 static PyObject *_wrap_BLACK_PEN_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_BLACK_PEN_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxBLACK_PEN, SWIGTYPE_p_wxPen, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxBLACK_PEN), SWIGTYPE_p_wxPen, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14757,7 +16380,7 @@ static int _wrap_WHITE_PEN_set(PyObject *_val) {
 static PyObject *_wrap_WHITE_PEN_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_WHITE_PEN_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxWHITE_PEN, SWIGTYPE_p_wxPen, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxWHITE_PEN), SWIGTYPE_p_wxPen, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14771,7 +16394,7 @@ static int _wrap_TRANSPARENT_PEN_set(PyObject *_val) {
 static PyObject *_wrap_TRANSPARENT_PEN_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_TRANSPARENT_PEN_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxTRANSPARENT_PEN, SWIGTYPE_p_wxPen, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxTRANSPARENT_PEN), SWIGTYPE_p_wxPen, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14785,7 +16408,7 @@ static int _wrap_BLACK_DASHED_PEN_set(PyObject *_val) {
 static PyObject *_wrap_BLACK_DASHED_PEN_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_BLACK_DASHED_PEN_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxBLACK_DASHED_PEN, SWIGTYPE_p_wxPen, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxBLACK_DASHED_PEN), SWIGTYPE_p_wxPen, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14799,7 +16422,7 @@ static int _wrap_GREY_PEN_set(PyObject *_val) {
 static PyObject *_wrap_GREY_PEN_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_GREY_PEN_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxGREY_PEN, SWIGTYPE_p_wxPen, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxGREY_PEN), SWIGTYPE_p_wxPen, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14813,7 +16436,7 @@ static int _wrap_MEDIUM_GREY_PEN_set(PyObject *_val) {
 static PyObject *_wrap_MEDIUM_GREY_PEN_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_MEDIUM_GREY_PEN_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxMEDIUM_GREY_PEN, SWIGTYPE_p_wxPen, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxMEDIUM_GREY_PEN), SWIGTYPE_p_wxPen, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14827,7 +16450,7 @@ static int _wrap_LIGHT_GREY_PEN_set(PyObject *_val) {
 static PyObject *_wrap_LIGHT_GREY_PEN_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_LIGHT_GREY_PEN_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY_PEN, SWIGTYPE_p_wxPen, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxLIGHT_GREY_PEN), SWIGTYPE_p_wxPen, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14841,7 +16464,7 @@ static int _wrap_BLUE_BRUSH_set(PyObject *_val) {
 static PyObject *_wrap_BLUE_BRUSH_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_BLUE_BRUSH_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxBLUE_BRUSH, SWIGTYPE_p_wxBrush, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxBLUE_BRUSH), SWIGTYPE_p_wxBrush, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14855,7 +16478,7 @@ static int _wrap_GREEN_BRUSH_set(PyObject *_val) {
 static PyObject *_wrap_GREEN_BRUSH_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_GREEN_BRUSH_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxGREEN_BRUSH, SWIGTYPE_p_wxBrush, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxGREEN_BRUSH), SWIGTYPE_p_wxBrush, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14869,7 +16492,7 @@ static int _wrap_WHITE_BRUSH_set(PyObject *_val) {
 static PyObject *_wrap_WHITE_BRUSH_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_WHITE_BRUSH_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxWHITE_BRUSH, SWIGTYPE_p_wxBrush, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxWHITE_BRUSH), SWIGTYPE_p_wxBrush, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14883,7 +16506,7 @@ static int _wrap_BLACK_BRUSH_set(PyObject *_val) {
 static PyObject *_wrap_BLACK_BRUSH_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_BLACK_BRUSH_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxBLACK_BRUSH, SWIGTYPE_p_wxBrush, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxBLACK_BRUSH), SWIGTYPE_p_wxBrush, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14897,7 +16520,7 @@ static int _wrap_TRANSPARENT_BRUSH_set(PyObject *_val) {
 static PyObject *_wrap_TRANSPARENT_BRUSH_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_TRANSPARENT_BRUSH_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxTRANSPARENT_BRUSH, SWIGTYPE_p_wxBrush, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxTRANSPARENT_BRUSH), SWIGTYPE_p_wxBrush, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14911,7 +16534,7 @@ static int _wrap_CYAN_BRUSH_set(PyObject *_val) {
 static PyObject *_wrap_CYAN_BRUSH_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_CYAN_BRUSH_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxCYAN_BRUSH, SWIGTYPE_p_wxBrush, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxCYAN_BRUSH), SWIGTYPE_p_wxBrush, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14925,7 +16548,7 @@ static int _wrap_RED_BRUSH_set(PyObject *_val) {
 static PyObject *_wrap_RED_BRUSH_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_RED_BRUSH_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxRED_BRUSH, SWIGTYPE_p_wxBrush, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxRED_BRUSH), SWIGTYPE_p_wxBrush, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14939,7 +16562,7 @@ static int _wrap_GREY_BRUSH_set(PyObject *_val) {
 static PyObject *_wrap_GREY_BRUSH_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_GREY_BRUSH_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxGREY_BRUSH, SWIGTYPE_p_wxBrush, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxGREY_BRUSH), SWIGTYPE_p_wxBrush, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14953,7 +16576,7 @@ static int _wrap_MEDIUM_GREY_BRUSH_set(PyObject *_val) {
 static PyObject *_wrap_MEDIUM_GREY_BRUSH_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_MEDIUM_GREY_BRUSH_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxMEDIUM_GREY_BRUSH, SWIGTYPE_p_wxBrush, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxMEDIUM_GREY_BRUSH), SWIGTYPE_p_wxBrush, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14967,7 +16590,7 @@ static int _wrap_LIGHT_GREY_BRUSH_set(PyObject *_val) {
 static PyObject *_wrap_LIGHT_GREY_BRUSH_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_LIGHT_GREY_BRUSH_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY_BRUSH, SWIGTYPE_p_wxBrush, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxLIGHT_GREY_BRUSH), SWIGTYPE_p_wxBrush, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14981,7 +16604,7 @@ static int _wrap_BLACK_set(PyObject *_val) {
 static PyObject *_wrap_BLACK_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_BLACK_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxBLACK, SWIGTYPE_p_wxColour, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxBLACK), SWIGTYPE_p_wxColour, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -14995,7 +16618,7 @@ static int _wrap_WHITE_set(PyObject *_val) {
 static PyObject *_wrap_WHITE_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_WHITE_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxWHITE, SWIGTYPE_p_wxColour, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxWHITE), SWIGTYPE_p_wxColour, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15009,7 +16632,7 @@ static int _wrap_RED_set(PyObject *_val) {
 static PyObject *_wrap_RED_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_RED_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxRED, SWIGTYPE_p_wxColour, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxRED), SWIGTYPE_p_wxColour, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15023,7 +16646,7 @@ static int _wrap_BLUE_set(PyObject *_val) {
 static PyObject *_wrap_BLUE_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_BLUE_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxBLUE, SWIGTYPE_p_wxColour, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxBLUE), SWIGTYPE_p_wxColour, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15037,7 +16660,7 @@ static int _wrap_GREEN_set(PyObject *_val) {
 static PyObject *_wrap_GREEN_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_GREEN_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxGREEN, SWIGTYPE_p_wxColour, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxGREEN), SWIGTYPE_p_wxColour, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15051,7 +16674,7 @@ static int _wrap_CYAN_set(PyObject *_val) {
 static PyObject *_wrap_CYAN_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_CYAN_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxCYAN, SWIGTYPE_p_wxColour, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxCYAN), SWIGTYPE_p_wxColour, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15065,7 +16688,7 @@ static int _wrap_LIGHT_GREY_set(PyObject *_val) {
 static PyObject *_wrap_LIGHT_GREY_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_LIGHT_GREY_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY, SWIGTYPE_p_wxColour, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxLIGHT_GREY), SWIGTYPE_p_wxColour, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15079,7 +16702,7 @@ static int _wrap_STANDARD_CURSOR_set(PyObject *_val) {
 static PyObject *_wrap_STANDARD_CURSOR_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_STANDARD_CURSOR_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxSTANDARD_CURSOR, SWIGTYPE_p_wxCursor, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxSTANDARD_CURSOR), SWIGTYPE_p_wxCursor, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15093,7 +16716,7 @@ static int _wrap_HOURGLASS_CURSOR_set(PyObject *_val) {
 static PyObject *_wrap_HOURGLASS_CURSOR_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_HOURGLASS_CURSOR_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxHOURGLASS_CURSOR, SWIGTYPE_p_wxCursor, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxHOURGLASS_CURSOR), SWIGTYPE_p_wxCursor, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15107,7 +16730,7 @@ static int _wrap_CROSS_CURSOR_set(PyObject *_val) {
 static PyObject *_wrap_CROSS_CURSOR_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_CROSS_CURSOR_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) wxCROSS_CURSOR, SWIGTYPE_p_wxCursor, 0);
+    pyobj = SWIG_NewPointerObj((void *)(wxCROSS_CURSOR), SWIGTYPE_p_wxCursor, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15121,7 +16744,7 @@ static int _wrap_NullBitmap_set(PyObject *_val) {
 static PyObject *_wrap_NullBitmap_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_NullBitmap_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) &wxNullBitmap, SWIGTYPE_p_wxBitmap, 0);
+    pyobj = SWIG_NewPointerObj((void *)(&wxNullBitmap), SWIGTYPE_p_wxBitmap, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15135,7 +16758,7 @@ static int _wrap_NullIcon_set(PyObject *_val) {
 static PyObject *_wrap_NullIcon_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_NullIcon_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) &wxNullIcon, SWIGTYPE_p_wxIcon, 0);
+    pyobj = SWIG_NewPointerObj((void *)(&wxNullIcon), SWIGTYPE_p_wxIcon, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15149,7 +16772,7 @@ static int _wrap_NullCursor_set(PyObject *_val) {
 static PyObject *_wrap_NullCursor_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_NullCursor_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) &wxNullCursor, SWIGTYPE_p_wxCursor, 0);
+    pyobj = SWIG_NewPointerObj((void *)(&wxNullCursor), SWIGTYPE_p_wxCursor, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15163,7 +16786,7 @@ static int _wrap_NullPen_set(PyObject *_val) {
 static PyObject *_wrap_NullPen_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_NullPen_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) &wxNullPen, SWIGTYPE_p_wxPen, 0);
+    pyobj = SWIG_NewPointerObj((void *)(&wxNullPen), SWIGTYPE_p_wxPen, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15177,7 +16800,7 @@ static int _wrap_NullBrush_set(PyObject *_val) {
 static PyObject *_wrap_NullBrush_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_NullBrush_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) &wxNullBrush, SWIGTYPE_p_wxBrush, 0);
+    pyobj = SWIG_NewPointerObj((void *)(&wxNullBrush), SWIGTYPE_p_wxBrush, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15191,7 +16814,7 @@ static int _wrap_NullPalette_set(PyObject *_val) {
 static PyObject *_wrap_NullPalette_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_NullPalette_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) &wxNullPalette, SWIGTYPE_p_wxPalette, 0);
+    pyobj = SWIG_NewPointerObj((void *)(&wxNullPalette), SWIGTYPE_p_wxPalette, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15205,7 +16828,7 @@ static int _wrap_NullFont_set(PyObject *_val) {
 static PyObject *_wrap_NullFont_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_NullFont_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) &wxNullFont, SWIGTYPE_p_wxFont, 0);
+    pyobj = SWIG_NewPointerObj((void *)(&wxNullFont), SWIGTYPE_p_wxFont, 0);

     return pyobj;
 }
 
     return pyobj;
 }
 


@@ -15219,264 +16842,227 @@ static int _wrap_NullColour_set(PyObject *_val) {
 static PyObject *_wrap_NullColour_get() {
     PyObject *pyobj;
     
 static PyObject *_wrap_NullColour_get() {
     PyObject *pyobj;
     

-    pyobj = SWIG_NewPointerObj((void *) &wxNullColour, SWIGTYPE_p_wxColour, 0);
-    return pyobj;
-}
-
-
-static int _wrap_TheFontList_set(PyObject *_val) {
-    PyErr_SetString(PyExc_TypeError,"Variable TheFontList is read-only.");
-    return 1;
-}
-
-
-static PyObject *_wrap_TheFontList_get() {
-    PyObject *pyobj;
-    
-    pyobj = SWIG_NewPointerObj((void *) wxTheFontList, SWIGTYPE_p_wxFontList, 0);
-    return pyobj;
-}
-
-
-static int _wrap_ThePenList_set(PyObject *_val) {
-    PyErr_SetString(PyExc_TypeError,"Variable ThePenList is read-only.");
-    return 1;
-}
-
-
-static PyObject *_wrap_ThePenList_get() {
-    PyObject *pyobj;
-    
-    pyobj = SWIG_NewPointerObj((void *) wxThePenList, SWIGTYPE_p_wxPenList, 0);
-    return pyobj;
-}
-
-
-static int _wrap_TheBrushList_set(PyObject *_val) {
-    PyErr_SetString(PyExc_TypeError,"Variable TheBrushList is read-only.");
-    return 1;
-}
-
-
-static PyObject *_wrap_TheBrushList_get() {
-    PyObject *pyobj;
-    
-    pyobj = SWIG_NewPointerObj((void *) wxTheBrushList, SWIGTYPE_p_wxBrushList, 0);
+    pyobj = SWIG_NewPointerObj((void *)(&wxNullColour), SWIGTYPE_p_wxColour, 0);

     return pyobj;
 }
 
 
     return pyobj;
 }
 
 

-static int _wrap_TheColourDatabase_set(PyObject *_val) {
-    PyErr_SetString(PyExc_TypeError,"Variable TheColourDatabase is read-only.");
-    return 1;
-}
-
-
-static PyObject *_wrap_TheColourDatabase_get() {
-    PyObject *pyobj;
+static PyObject *_wrap_PenList_AddPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPenList *arg1 = (wxPenList *) 0 ;
+    wxPen *arg2 = (wxPen *) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "pen", NULL 
+    };

     
     

-    pyobj = SWIG_NewPointerObj((void *) wxTheColourDatabase, SWIGTYPE_p_wxColourDatabase, 0);
-    return pyobj;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_AddPen",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPenList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->AddPen(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;

 }
 
 
 }
 
 

-static PyObject *_wrap_new_DragImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PenList_FindOrCreatePen(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxBitmap *arg1 = 0 ;
-    wxCursor const &arg2_defvalue = wxNullCursor ;
-    wxCursor *arg2 = (wxCursor *) &arg2_defvalue ;
-    wxGenericDragImage *result;
+    wxPenList *arg1 = (wxPenList *) 0 ;
+    wxColour *arg2 = 0 ;
+    int arg3 ;
+    int arg4 ;
+    wxPen *result;
+    wxColour temp2 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "image",(char *) "cursor", NULL 
+        (char *) "self",(char *) "colour",(char *) "width",(char *) "style", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_DragImage",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg1 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
-    if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-        if (arg2 == NULL) {
-            PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-        }
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PenList_FindOrCreatePen",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPenList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        arg2 = &temp2;
+        if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;

     }
     }

+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxGenericDragImage *)new wxGenericDragImage((wxBitmap const &)*arg1,(wxCursor const &)*arg2);
+        result = (wxPen *)(arg1)->FindOrCreatePen((wxColour const &)*arg2,arg3,arg4);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0);

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_new_DragIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PenList_RemovePen(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxIcon *arg1 = 0 ;
-    wxCursor const &arg2_defvalue = wxNullCursor ;
-    wxCursor *arg2 = (wxCursor *) &arg2_defvalue ;
-    wxGenericDragImage *result;
+    wxPenList *arg1 = (wxPenList *) 0 ;
+    wxPen *arg2 = (wxPen *) 0 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {

-        (char *) "image",(char *) "cursor", NULL 
+        (char *) "self",(char *) "pen", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_DragIcon",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg1 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
-    if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-        if (arg2 == NULL) {
-            PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-        }
-    }
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_RemovePen",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPenList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPen,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxGenericDragImage *)new wxGenericDragImage((wxIcon const &)*arg1,(wxCursor const &)*arg2);
+        (arg1)->RemovePen(arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
+    Py_INCREF(Py_None); resultobj = Py_None;

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_new_DragString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PenList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxString *arg1 = 0 ;
-    wxCursor const &arg2_defvalue = wxNullCursor ;
-    wxCursor *arg2 = (wxCursor *) &arg2_defvalue ;
-    wxGenericDragImage *result;
-    bool temp1 = false ;
+    wxPenList *arg1 = (wxPenList *) 0 ;
+    int result;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

-    PyObject * obj1 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "str",(char *) "cursor", NULL 
+        (char *) "self", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_DragString",kwnames,&obj0,&obj1)) goto fail;
-    {
-        arg1 = wxString_in_helper(obj0);
-        if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
-    }
-    if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-        if (arg2 == NULL) {
-            PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-        }
-    }
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PenList_GetCount",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPenList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxGenericDragImage *)new wxGenericDragImage((wxString const &)*arg1,(wxCursor const &)*arg2);
+        result = (int)(arg1)->GetCount();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
-    {
-        if (temp1)
-        delete arg1;
-    }
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return resultobj;
     fail:

-    {
-        if (temp1)
-        delete arg1;
-    }

     return NULL;
 }
 
 
     return NULL;
 }
 
 

-static PyObject *_wrap_new_DragTreeItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject * PenList_swigregister(PyObject *self, PyObject *args) {
+    PyObject *obj;
+    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
+    SWIG_TypeClientData(SWIGTYPE_p_wxPenList, obj);
+    Py_INCREF(obj);
+    return Py_BuildValue((char *)"");
+}
+static PyObject *_wrap_BrushList_AddBrush(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxTreeCtrl *arg1 = 0 ;
-    wxTreeItemId *arg2 = 0 ;
-    wxGenericDragImage *result;
+    wxBrushList *arg1 = (wxBrushList *) 0 ;
+    wxBrush *arg2 = (wxBrush *) 0 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {

-        (char *) "treeCtrl",(char *) "id", NULL 
+        (char *) "self",(char *) "brush", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_DragTreeItem",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg1 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_AddBrush",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrushList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxGenericDragImage *)new wxGenericDragImage((wxTreeCtrl const &)*arg1,*arg2);
+        (arg1)->AddBrush(arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
+    Py_INCREF(Py_None); resultobj = Py_None;

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_new_DragListItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxListCtrl *arg1 = 0 ;
-    long arg2 ;
-    wxGenericDragImage *result;
+    wxBrushList *arg1 = (wxBrushList *) 0 ;
+    wxColour *arg2 = 0 ;
+    int arg3 ;
+    wxBrush *result;
+    wxColour temp2 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "listCtrl",(char *) "id", NULL 
+        (char *) "self",(char *) "colour",(char *) "style", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:new_DragListItem",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg1 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrushList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        arg2 = &temp2;
+        if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;

     }
     }

+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (wxGenericDragImage *)new wxGenericDragImage((wxListCtrl const &)*arg1,arg2);
+        result = (wxBrush *)(arg1)->FindOrCreateBrush((wxColour const &)*arg2,arg3);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 0);

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_delete_DragImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BrushList_RemoveBrush(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
+    wxBrushList *arg1 = (wxBrushList *) 0 ;
+    wxBrush *arg2 = (wxBrush *) 0 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self", NULL 
+        (char *) "self",(char *) "brush", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_DragImage",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_RemoveBrush",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrushList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        delete arg1;
+        (arg1)->RemoveBrush(arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;


@@ -15488,403 +17074,499 @@ static PyObject *_wrap_delete_DragImage(PyObject *self, PyObject *args, PyObject
 }
 
 
 }
 
 

-static PyObject *_wrap_DragImage_SetBackingBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BrushList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxBitmap *arg2 = (wxBitmap *) 0 ;
+    wxBrushList *arg1 = (wxBrushList *) 0 ;
+    int result;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

-    PyObject * obj1 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self",(char *) "bitmap", NULL 
+        (char *) "self", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DragImage_SetBackingBitmap",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BrushList_GetCount",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrushList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->SetBackingBitmap(arg2);
+        result = (int)(arg1)->GetCount();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    Py_INCREF(Py_None); resultobj = Py_None;
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject * BrushList_swigregister(PyObject *self, PyObject *args) {
+    PyObject *obj;
+    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
+    SWIG_TypeClientData(SWIGTYPE_p_wxBrushList, obj);
+    Py_INCREF(obj);
+    return Py_BuildValue((char *)"");
+}
+static PyObject *_wrap_new_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxPoint *arg2 = 0 ;
-    wxWindow *arg3 = (wxWindow *) 0 ;
-    bool arg4 = (bool) FALSE ;
-    wxRect *arg5 = (wxRect *) NULL ;
-    bool result;
-    wxPoint temp2 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    PyObject * obj2 = 0 ;
-    PyObject * obj3 = 0 ;
-    PyObject * obj4 = 0 ;
+    wxColourDatabase *result;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self",(char *) "hotspot",(char *) "window",(char *) "fullScreen",(char *) "rect", NULL 
+        NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:DragImage_BeginDrag",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = &temp2;
-        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-    }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (obj3) {
-        arg4 = PyInt_AsLong(obj3) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    if (obj4) {
-        if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    }
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_ColourDatabase",kwnames)) goto fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)(arg1)->BeginDrag((wxPoint const &)*arg2,arg3,arg4,arg5);
+        result = (wxColourDatabase *)new wxColourDatabase();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxColourDatabase, 1);

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_DragImage_BeginDragBounded(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxPoint *arg2 = 0 ;
-    wxWindow *arg3 = (wxWindow *) 0 ;
-    wxWindow *arg4 = (wxWindow *) 0 ;
-    bool result;
-    wxPoint temp2 ;
+    wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

-    PyObject * obj1 = 0 ;
-    PyObject * obj2 = 0 ;
-    PyObject * obj3 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self",(char *) "hotspot",(char *) "window",(char *) "boundingWindow", NULL 
+        (char *) "self", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DragImage_BeginDragBounded",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = &temp2;
-        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-    }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ColourDatabase",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColourDatabase,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)(arg1)->BeginDrag((wxPoint const &)*arg2,arg3,arg4);
+        delete arg1;

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    Py_INCREF(Py_None); resultobj = Py_None;

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_DragImage_EndDrag(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourDatabase_Find(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    bool result;
+    wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
+    wxString *arg2 = 0 ;
+    wxColour result;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self", NULL 
+        (char *) "self",(char *) "name", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DragImage_EndDrag",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_Find",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColourDatabase,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        arg2 = wxString_in_helper(obj1);
+        if (arg2 == NULL) SWIG_fail;
+        temp2 = True;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)(arg1)->EndDrag();
+        result = ((wxColourDatabase const *)arg1)->Find((wxString const &)*arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        wxColour * resultptr;
+        resultptr = new wxColour((wxColour &) result);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);
+    }
+    {
+        if (temp2)
+        delete arg2;
+    }

     return resultobj;
     fail:
     return resultobj;
     fail:

+    {
+        if (temp2)
+        delete arg2;
+    }

     return NULL;
 }
 
 
     return NULL;
 }
 
 

-static PyObject *_wrap_DragImage_Move(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourDatabase_FindName(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxPoint *arg2 = 0 ;
-    bool result;
-    wxPoint temp2 ;
+    wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
+    wxColour *arg2 = 0 ;
+    wxString result;
+    wxColour temp2 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {

-        (char *) "self",(char *) "pt", NULL 
+        (char *) "self",(char *) "colour", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DragImage_Move",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_FindName",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColourDatabase,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
     {
         arg2 = &temp2;

-        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+        if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)(arg1)->Move((wxPoint const &)*arg2);
+        result = ((wxColourDatabase const *)arg1)->FindName((wxColour const &)*arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+#if wxUSE_UNICODE
+        resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+        resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+    }

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_DragImage_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    bool result;
+    wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
+    wxString *arg2 = 0 ;
+    wxColour *arg3 = 0 ;
+    bool temp2 = False ;
+    wxColour temp3 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self", NULL 
+        (char *) "self",(char *) "name",(char *) "colour", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DragImage_Show",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourDatabase_AddColour",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColourDatabase,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        arg2 = wxString_in_helper(obj1);
+        if (arg2 == NULL) SWIG_fail;
+        temp2 = True;
+    }
+    {
+        arg3 = &temp3;
+        if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)(arg1)->Show();
+        (arg1)->AddColour((wxString const &)*arg2,(wxColour const &)*arg3);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        if (temp2)
+        delete arg2;
+    }

     return resultobj;
     fail:
     return resultobj;
     fail:

+    {
+        if (temp2)
+        delete arg2;
+    }

     return NULL;
 }
 
 
     return NULL;
 }
 
 

-static PyObject *_wrap_DragImage_Hide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    bool result;
+    wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
+    wxString *arg2 = 0 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
+    bool temp2 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self", NULL 
+        (char *) "self",(char *) "name",(char *) "red",(char *) "green",(char *) "blue", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DragImage_Hide",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:ColourDatabase_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColourDatabase,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        arg2 = wxString_in_helper(obj1);
+        if (arg2 == NULL) SWIG_fail;
+        temp2 = True;
+    }
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)(arg1)->Hide();
+        wxColourDatabase_Append(arg1,(wxString const &)*arg2,arg3,arg4,arg5);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        if (temp2)
+        delete arg2;
+    }

     return resultobj;
     fail:
     return resultobj;
     fail:

+    {
+        if (temp2)
+        delete arg2;
+    }

     return NULL;
 }
 
 
     return NULL;
 }
 
 

-static PyObject *_wrap_DragImage_GetImageRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject * ColourDatabase_swigregister(PyObject *self, PyObject *args) {
+    PyObject *obj;
+    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
+    SWIG_TypeClientData(SWIGTYPE_p_wxColourDatabase, obj);
+    Py_INCREF(obj);
+    return Py_BuildValue((char *)"");
+}
+static PyObject *_wrap_FontList_AddFont(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxPoint *arg2 = 0 ;
-    wxRect result;
-    wxPoint temp2 ;
+    wxFontList *arg1 = (wxFontList *) 0 ;
+    wxFont *arg2 = (wxFont *) 0 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {

-        (char *) "self",(char *) "pos", NULL 
+        (char *) "self",(char *) "font", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DragImage_GetImageRect",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = &temp2;
-        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-    }
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_AddFont",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = ((wxGenericDragImage const *)arg1)->GetImageRect((wxPoint const &)*arg2);
+        (arg1)->AddFont(arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    {
-        wxRect * resultptr;
-        resultptr = new wxRect((wxRect &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1);
-    }
+    Py_INCREF(Py_None); resultobj = Py_None;

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_DragImage_DoDrawImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxDC *arg2 = 0 ;
-    wxPoint *arg3 = 0 ;
-    bool result;
-    wxPoint temp3 ;
+    wxFontList *arg1 = (wxFontList *) 0 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
+    bool arg6 = (bool) False ;
+    wxString const &arg7_defvalue = wxPyEmptyString ;
+    wxString *arg7 = (wxString *) &arg7_defvalue ;
+    int arg8 = (int) wxFONTENCODING_DEFAULT ;
+    wxFont *result;
+    bool temp7 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;

+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
+    PyObject * obj7 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self",(char *) "dc",(char *) "pos", NULL 
+        (char *) "self",(char *) "point_size",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "facename",(char *) "encoding", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DragImage_DoDrawImage",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:FontList_FindOrCreateFont",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (bool) SWIG_AsBool(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;

     }
     }

-    {
-        arg3 = &temp3;
-        if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
+    if (obj6) {
+        {
+            arg7 = wxString_in_helper(obj6);
+            if (arg7 == NULL) SWIG_fail;
+            temp7 = True;
+        }
+    }
+    if (obj7) {
+        arg8 = (wxFontEncoding) SWIG_AsInt(obj7); 
+        if (PyErr_Occurred()) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)((wxGenericDragImage const *)arg1)->DoDrawImage(*arg2,(wxPoint const &)*arg3);
+        result = (wxFont *)(arg1)->FindOrCreateFont(arg2,arg3,arg4,arg5,arg6,(wxString const &)*arg7,(wxFontEncoding )arg8);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0);
+    {
+        if (temp7)
+        delete arg7;
+    }

     return resultobj;
     fail:
     return resultobj;
     fail:

+    {
+        if (temp7)
+        delete arg7;
+    }

     return NULL;
 }
 
 
     return NULL;
 }
 
 

-static PyObject *_wrap_DragImage_UpdateBackingFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontList_RemoveFont(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxDC *arg2 = 0 ;
-    wxMemoryDC *arg3 = 0 ;
-    wxRect *arg4 = 0 ;
-    wxRect *arg5 = 0 ;
-    bool result;
-    wxRect temp4 ;
-    wxRect temp5 ;
+    wxFontList *arg1 = (wxFontList *) 0 ;
+    wxFont *arg2 = (wxFont *) 0 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

-    PyObject * obj2 = 0 ;
-    PyObject * obj3 = 0 ;
-    PyObject * obj4 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self",(char *) "windowDC",(char *) "destDC",(char *) "sourceRect",(char *) "destRect", NULL 
+        (char *) "self",(char *) "font", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DragImage_UpdateBackingFromWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMemoryDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg3 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
-    {
-        arg4 = &temp4;
-        if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
-    }
-    {
-        arg5 = &temp5;
-        if ( ! wxRect_helper(obj4, &arg5)) SWIG_fail;
-    }
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_RemoveFont",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)((wxGenericDragImage const *)arg1)->UpdateBackingFromWindow(*arg2,*arg3,(wxRect const &)*arg4,(wxRect const &)*arg5);
+        (arg1)->RemoveFont(arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    Py_INCREF(Py_None); resultobj = Py_None;

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     PyObject *resultobj;

-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxPoint *arg2 = 0 ;
-    wxPoint *arg3 = 0 ;
-    bool arg4 ;
-    bool arg5 ;
-    bool result;
-    wxPoint temp2 ;
-    wxPoint temp3 ;
+    wxFontList *arg1 = (wxFontList *) 0 ;
+    int result;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

-    PyObject * obj1 = 0 ;
-    PyObject * obj2 = 0 ;
-    PyObject * obj3 = 0 ;
-    PyObject * obj4 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self",(char *) "oldPos",(char *) "newPos",(char *) "eraseOld",(char *) "drawNew", NULL 
+        (char *) "self", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DragImage_RedrawImage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = &temp2;
-        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-    }
-    {
-        arg3 = &temp3;
-        if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
-    }
-    arg4 = PyInt_AsLong(obj3) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
-    arg5 = PyInt_AsLong(obj4) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontList_GetCount",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)(arg1)->RedrawImage((wxPoint const &)*arg2,(wxPoint const &)*arg3,arg4,arg5);
+        result = (int)(arg1)->GetCount();

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject * DragImage_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FontList_swigregister(PyObject *self, PyObject *args) {

     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;

-    SWIG_TypeClientData(SWIGTYPE_p_wxGenericDragImage, obj);
+    SWIG_TypeClientData(SWIGTYPE_p_wxFontList, obj);

     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }

+static int _wrap_TheFontList_set(PyObject *_val) {
+    PyErr_SetString(PyExc_TypeError,"Variable TheFontList is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_TheFontList_get() {
+    PyObject *pyobj;
+    
+    pyobj = SWIG_NewPointerObj((void *)(wxTheFontList), SWIGTYPE_p_wxFontList, 0);
+    return pyobj;
+}
+
+
+static int _wrap_ThePenList_set(PyObject *_val) {
+    PyErr_SetString(PyExc_TypeError,"Variable ThePenList is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ThePenList_get() {
+    PyObject *pyobj;
+    
+    pyobj = SWIG_NewPointerObj((void *)(wxThePenList), SWIGTYPE_p_wxPenList, 0);
+    return pyobj;
+}
+
+
+static int _wrap_TheBrushList_set(PyObject *_val) {
+    PyErr_SetString(PyExc_TypeError,"Variable TheBrushList is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_TheBrushList_get() {
+    PyObject *pyobj;
+    
+    pyobj = SWIG_NewPointerObj((void *)(wxTheBrushList), SWIGTYPE_p_wxBrushList, 0);
+    return pyobj;
+}
+
+
+static int _wrap_TheColourDatabase_set(PyObject *_val) {
+    PyErr_SetString(PyExc_TypeError,"Variable TheColourDatabase is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_TheColourDatabase_get() {
+    PyObject *pyobj;
+    
+    pyobj = SWIG_NewPointerObj((void *)(wxTheColourDatabase), SWIGTYPE_p_wxColourDatabase, 0);
+    return pyobj;
+}
+
+

 static PyObject *_wrap_new_Effects(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *result;
 static PyObject *_wrap_new_Effects(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *result;


@@ -15900,7 +17582,7 @@ static PyObject *_wrap_new_Effects(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxEffects, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEffects, 1);

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -15917,7 +17599,8 @@ static PyObject *_wrap_Effects_GetHighlightColour(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetHighlightColour",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetHighlightColour",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEffects,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxEffects const *)arg1)->GetHighlightColour();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxEffects const *)arg1)->GetHighlightColour();


@@ -15928,7 +17611,7 @@ static PyObject *_wrap_Effects_GetHighlightColour(PyObject *self, PyObject *args
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -15946,7 +17629,8 @@ static PyObject *_wrap_Effects_GetLightShadow(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetLightShadow",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetLightShadow",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEffects,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxEffects const *)arg1)->GetLightShadow();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxEffects const *)arg1)->GetLightShadow();


@@ -15957,7 +17641,7 @@ static PyObject *_wrap_Effects_GetLightShadow(PyObject *self, PyObject *args, Py
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -15975,7 +17659,8 @@ static PyObject *_wrap_Effects_GetFaceColour(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetFaceColour",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetFaceColour",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEffects,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxEffects const *)arg1)->GetFaceColour();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxEffects const *)arg1)->GetFaceColour();


@@ -15986,7 +17671,7 @@ static PyObject *_wrap_Effects_GetFaceColour(PyObject *self, PyObject *args, PyO
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -16004,7 +17689,8 @@ static PyObject *_wrap_Effects_GetMediumShadow(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetMediumShadow",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetMediumShadow",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEffects,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxEffects const *)arg1)->GetMediumShadow();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxEffects const *)arg1)->GetMediumShadow();


@@ -16015,7 +17701,7 @@ static PyObject *_wrap_Effects_GetMediumShadow(PyObject *self, PyObject *args, P
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -16033,7 +17719,8 @@ static PyObject *_wrap_Effects_GetDarkShadow(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetDarkShadow",kwnames,&obj0)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetDarkShadow",kwnames,&obj0)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEffects,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxEffects const *)arg1)->GetDarkShadow();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = ((wxEffects const *)arg1)->GetDarkShadow();


@@ -16044,7 +17731,7 @@ static PyObject *_wrap_Effects_GetDarkShadow(PyObject *self, PyObject *args, PyO
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);
     {
         wxColour * resultptr;
         resultptr = new wxColour((wxColour &) result);

-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -16064,7 +17751,8 @@ static PyObject *_wrap_Effects_SetHighlightColour(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetHighlightColour",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetHighlightColour",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEffects,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;


@@ -16095,7 +17783,8 @@ static PyObject *_wrap_Effects_SetLightShadow(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetLightShadow",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetLightShadow",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEffects,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;


@@ -16126,7 +17815,8 @@ static PyObject *_wrap_Effects_SetFaceColour(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetFaceColour",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetFaceColour",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEffects,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;


@@ -16157,7 +17847,8 @@ static PyObject *_wrap_Effects_SetMediumShadow(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetMediumShadow",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetMediumShadow",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEffects,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;


@@ -16188,7 +17879,8 @@ static PyObject *_wrap_Effects_SetDarkShadow(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetDarkShadow",kwnames,&obj0,&obj1)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetDarkShadow",kwnames,&obj0,&obj1)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEffects,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;


@@ -16231,7 +17923,8 @@ static PyObject *_wrap_Effects_Set(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:Effects_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:Effects_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEffects,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;


@@ -16276,20 +17969,29 @@ static PyObject *_wrap_Effects_DrawSunkenEdge(PyObject *self, PyObject *args, Py
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;

+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
         (char *) "self",(char *) "dc",(char *) "rect",(char *) "borderSize", NULL 
     };
     
     char *kwnames[] = {
         (char *) "self",(char *) "dc",(char *) "rect",(char *) "borderSize", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:Effects_DrawSunkenEdge",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Effects_DrawSunkenEdge",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEffects,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg2 == NULL) {
     if (arg2 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         arg3 = &temp3;
         if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail;
     }
     }
     {
         arg3 = &temp3;
         if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail;
     }

+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawSunkenEdge(*arg2,(wxRect const &)*arg3,arg4);
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->DrawSunkenEdge(*arg2,(wxRect const &)*arg3,arg4);


@@ -16321,18 +18023,25 @@ static PyObject *_wrap_Effects_TileBitmap(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Effects_TileBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Effects_TileBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEffects,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;

     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }

-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg3 == NULL) {
     if (arg3 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     }

-    if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;

     if (arg4 == NULL) {
     if (arg4 == NULL) {

-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -16341,7 +18050,9 @@ static PyObject *_wrap_Effects_TileBitmap(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -16363,18 +18074,21 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GDIObject_IsNull", (PyCFunction) _wrap_GDIObject_IsNull, METH_VARARGS | METH_KEYWORDS },
         { (char *)"GDIObject_swigregister", GDIObject_swigregister, METH_VARARGS },
         { (char *)"new_Colour", (PyCFunction) _wrap_new_Colour, METH_VARARGS | METH_KEYWORDS },
         { (char *)"GDIObject_IsNull", (PyCFunction) _wrap_GDIObject_IsNull, METH_VARARGS | METH_KEYWORDS },
         { (char *)"GDIObject_swigregister", GDIObject_swigregister, METH_VARARGS },
         { (char *)"new_Colour", (PyCFunction) _wrap_new_Colour, METH_VARARGS | METH_KEYWORDS },

-        { (char *)"delete_Colour", (PyCFunction) _wrap_delete_Colour, METH_VARARGS | METH_KEYWORDS },

         { (char *)"new_NamedColour", (PyCFunction) _wrap_new_NamedColour, METH_VARARGS | METH_KEYWORDS },
         { (char *)"new_ColourRGB", (PyCFunction) _wrap_new_ColourRGB, METH_VARARGS | METH_KEYWORDS },
         { (char *)"new_NamedColour", (PyCFunction) _wrap_new_NamedColour, METH_VARARGS | METH_KEYWORDS },
         { (char *)"new_ColourRGB", (PyCFunction) _wrap_new_ColourRGB, METH_VARARGS | METH_KEYWORDS },

+        { (char *)"delete_Colour", (PyCFunction) _wrap_delete_Colour, METH_VARARGS | METH_KEYWORDS },

         { (char *)"Colour_Red", (PyCFunction) _wrap_Colour_Red, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour_Green", (PyCFunction) _wrap_Colour_Green, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour_Blue", (PyCFunction) _wrap_Colour_Blue, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour_Ok", (PyCFunction) _wrap_Colour_Ok, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour_Set", (PyCFunction) _wrap_Colour_Set, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour_Red", (PyCFunction) _wrap_Colour_Red, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour_Green", (PyCFunction) _wrap_Colour_Green, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour_Blue", (PyCFunction) _wrap_Colour_Blue, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour_Ok", (PyCFunction) _wrap_Colour_Ok, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour_Set", (PyCFunction) _wrap_Colour_Set, METH_VARARGS | METH_KEYWORDS },

-        { (char *)"Colour_SetRBG", (PyCFunction) _wrap_Colour_SetRBG, METH_VARARGS | METH_KEYWORDS },
+        { (char *)"Colour_SetRGB", (PyCFunction) _wrap_Colour_SetRGB, METH_VARARGS | METH_KEYWORDS },
+        { (char *)"Colour_SetFromName", (PyCFunction) _wrap_Colour_SetFromName, METH_VARARGS | METH_KEYWORDS },
+        { (char *)"Colour_GetPixel", (PyCFunction) _wrap_Colour_GetPixel, METH_VARARGS | METH_KEYWORDS },

         { (char *)"Colour___eq__", (PyCFunction) _wrap_Colour___eq__, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour___ne__", (PyCFunction) _wrap_Colour___ne__, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour_Get", (PyCFunction) _wrap_Colour_Get, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour___eq__", (PyCFunction) _wrap_Colour___eq__, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour___ne__", (PyCFunction) _wrap_Colour___ne__, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour_Get", (PyCFunction) _wrap_Colour_Get, METH_VARARGS | METH_KEYWORDS },

+        { (char *)"Colour_GetRGB", (PyCFunction) _wrap_Colour_GetRGB, METH_VARARGS | METH_KEYWORDS },

         { (char *)"Colour_swigregister", Colour_swigregister, METH_VARARGS },
         { (char *)"new_Palette", (PyCFunction) _wrap_new_Palette, METH_VARARGS | METH_KEYWORDS },
         { (char *)"delete_Palette", (PyCFunction) _wrap_delete_Palette, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Colour_swigregister", Colour_swigregister, METH_VARARGS },
         { (char *)"new_Palette", (PyCFunction) _wrap_new_Palette, METH_VARARGS | METH_KEYWORDS },
         { (char *)"delete_Palette", (PyCFunction) _wrap_delete_Palette, METH_VARARGS | METH_KEYWORDS },


@@ -16397,6 +18111,9 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Pen_SetWidth", (PyCFunction) _wrap_Pen_SetWidth, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Pen_SetDashes", (PyCFunction) _wrap_Pen_SetDashes, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Pen_GetDashes", (PyCFunction) _wrap_Pen_GetDashes, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Pen_SetWidth", (PyCFunction) _wrap_Pen_SetWidth, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Pen_SetDashes", (PyCFunction) _wrap_Pen_SetDashes, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Pen_GetDashes", (PyCFunction) _wrap_Pen_GetDashes, METH_VARARGS | METH_KEYWORDS },

+        { (char *)"Pen___eq__", (PyCFunction) _wrap_Pen___eq__, METH_VARARGS | METH_KEYWORDS },
+        { (char *)"Pen___ne__", (PyCFunction) _wrap_Pen___ne__, METH_VARARGS | METH_KEYWORDS },
+        { (char *)"Pen_GetDashCount", (PyCFunction) _wrap_Pen_GetDashCount, METH_VARARGS | METH_KEYWORDS },

         { (char *)"Pen_swigregister", Pen_swigregister, METH_VARARGS },
         { (char *)"new_PyPen", (PyCFunction) _wrap_new_PyPen, METH_VARARGS | METH_KEYWORDS },
         { (char *)"delete_PyPen", (PyCFunction) _wrap_delete_PyPen, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Pen_swigregister", Pen_swigregister, METH_VARARGS },
         { (char *)"new_PyPen", (PyCFunction) _wrap_new_PyPen, METH_VARARGS | METH_KEYWORDS },
         { (char *)"delete_PyPen", (PyCFunction) _wrap_delete_PyPen, METH_VARARGS | METH_KEYWORDS },


@@ -16434,9 +18151,10 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Bitmap_SetHeight", (PyCFunction) _wrap_Bitmap_SetHeight, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Bitmap_SetWidth", (PyCFunction) _wrap_Bitmap_SetWidth, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Bitmap_SetHeight", (PyCFunction) _wrap_Bitmap_SetHeight, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Bitmap_SetWidth", (PyCFunction) _wrap_Bitmap_SetWidth, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS },

+        { (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS },
+        { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS },

         { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS },
         { (char *)"new_Mask", (PyCFunction) _wrap_new_Mask, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS },
         { (char *)"new_Mask", (PyCFunction) _wrap_new_Mask, METH_VARARGS | METH_KEYWORDS },

-        { (char *)"new_MaskColour", (PyCFunction) _wrap_new_MaskColour, METH_VARARGS | METH_KEYWORDS },

         { (char *)"Mask_swigregister", Mask_swigregister, METH_VARARGS },
         { (char *)"new_Icon", (PyCFunction) _wrap_new_Icon, METH_VARARGS | METH_KEYWORDS },
         { (char *)"delete_Icon", (PyCFunction) _wrap_delete_Icon, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Mask_swigregister", Mask_swigregister, METH_VARARGS },
         { (char *)"new_Icon", (PyCFunction) _wrap_new_Icon, METH_VARARGS | METH_KEYWORDS },
         { (char *)"delete_Icon", (PyCFunction) _wrap_delete_Icon, METH_VARARGS | METH_KEYWORDS },


@@ -16474,7 +18192,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"delete_Cursor", (PyCFunction) _wrap_delete_Cursor, METH_VARARGS | METH_KEYWORDS },
         { (char *)"new_StockCursor", (PyCFunction) _wrap_new_StockCursor, METH_VARARGS | METH_KEYWORDS },
         { (char *)"new_CursorFromImage", (PyCFunction) _wrap_new_CursorFromImage, METH_VARARGS | METH_KEYWORDS },
         { (char *)"delete_Cursor", (PyCFunction) _wrap_delete_Cursor, METH_VARARGS | METH_KEYWORDS },
         { (char *)"new_StockCursor", (PyCFunction) _wrap_new_StockCursor, METH_VARARGS | METH_KEYWORDS },
         { (char *)"new_CursorFromImage", (PyCFunction) _wrap_new_CursorFromImage, METH_VARARGS | METH_KEYWORDS },

-        { (char *)"new_CursorFromBits", (PyCFunction) _wrap_new_CursorFromBits, METH_VARARGS | METH_KEYWORDS },

         { (char *)"Cursor_Ok", (PyCFunction) _wrap_Cursor_Ok, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Cursor_swigregister", Cursor_swigregister, METH_VARARGS },
         { (char *)"new_Region", (PyCFunction) _wrap_new_Region, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Cursor_Ok", (PyCFunction) _wrap_Cursor_Ok, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Cursor_swigregister", Cursor_swigregister, METH_VARARGS },
         { (char *)"new_Region", (PyCFunction) _wrap_new_Region, METH_VARARGS | METH_KEYWORDS },


@@ -16710,6 +18427,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"DC_SetBackground", (PyCFunction) _wrap_DC_SetBackground, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetBackgroundMode", (PyCFunction) _wrap_DC_SetBackgroundMode, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetPalette", (PyCFunction) _wrap_DC_SetPalette, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetBackground", (PyCFunction) _wrap_DC_SetBackground, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetBackgroundMode", (PyCFunction) _wrap_DC_SetBackgroundMode, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetPalette", (PyCFunction) _wrap_DC_SetPalette, METH_VARARGS | METH_KEYWORDS },

+        { (char *)"DC_SetClippingRegionXY", (PyCFunction) _wrap_DC_SetClippingRegionXY, METH_VARARGS | METH_KEYWORDS },

         { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetClippingRect", (PyCFunction) _wrap_DC_SetClippingRect, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetClippingRect", (PyCFunction) _wrap_DC_SetClippingRect, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS },


@@ -16721,10 +18439,11 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"DC_GetTextExtent", (PyCFunction) _wrap_DC_GetTextExtent, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_GetFullTextExtent", (PyCFunction) _wrap_DC_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_GetMultiLineTextExtent", (PyCFunction) _wrap_DC_GetMultiLineTextExtent, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_GetTextExtent", (PyCFunction) _wrap_DC_GetTextExtent, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_GetFullTextExtent", (PyCFunction) _wrap_DC_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_GetMultiLineTextExtent", (PyCFunction) _wrap_DC_GetMultiLineTextExtent, METH_VARARGS | METH_KEYWORDS },

-        { (char *)"DC_GetSizeTuple", (PyCFunction) _wrap_DC_GetSizeTuple, METH_VARARGS | METH_KEYWORDS },
+        { (char *)"DC_GetPartialTextExtents", (PyCFunction) _wrap_DC_GetPartialTextExtents, METH_VARARGS | METH_KEYWORDS },

         { (char *)"DC_GetSize", (PyCFunction) _wrap_DC_GetSize, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_GetSize", (PyCFunction) _wrap_DC_GetSize, METH_VARARGS | METH_KEYWORDS },

-        { (char *)"DC_GetSizeMMWH", (PyCFunction) _wrap_DC_GetSizeMMWH, METH_VARARGS | METH_KEYWORDS },
+        { (char *)"DC_GetSizeTuple", (PyCFunction) _wrap_DC_GetSizeTuple, METH_VARARGS | METH_KEYWORDS },

         { (char *)"DC_GetSizeMM", (PyCFunction) _wrap_DC_GetSizeMM, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_GetSizeMM", (PyCFunction) _wrap_DC_GetSizeMM, METH_VARARGS | METH_KEYWORDS },

+        { (char *)"DC_GetSizeMMTuple", (PyCFunction) _wrap_DC_GetSizeMMTuple, METH_VARARGS | METH_KEYWORDS },

         { (char *)"DC_DeviceToLogicalX", (PyCFunction) _wrap_DC_DeviceToLogicalX, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_DeviceToLogicalY", (PyCFunction) _wrap_DC_DeviceToLogicalY, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_DeviceToLogicalXRel", (PyCFunction) _wrap_DC_DeviceToLogicalXRel, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_DeviceToLogicalX", (PyCFunction) _wrap_DC_DeviceToLogicalX, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_DeviceToLogicalY", (PyCFunction) _wrap_DC_DeviceToLogicalY, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_DeviceToLogicalXRel", (PyCFunction) _wrap_DC_DeviceToLogicalXRel, METH_VARARGS | METH_KEYWORDS },


@@ -16753,11 +18472,11 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"DC_SetUserScale", (PyCFunction) _wrap_DC_SetUserScale, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_GetLogicalScale", (PyCFunction) _wrap_DC_GetLogicalScale, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetLogicalScale", (PyCFunction) _wrap_DC_SetLogicalScale, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetUserScale", (PyCFunction) _wrap_DC_SetUserScale, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_GetLogicalScale", (PyCFunction) _wrap_DC_GetLogicalScale, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetLogicalScale", (PyCFunction) _wrap_DC_SetLogicalScale, METH_VARARGS | METH_KEYWORDS },

-        { (char *)"DC_GetLogicalOriginTuple", (PyCFunction) _wrap_DC_GetLogicalOriginTuple, METH_VARARGS | METH_KEYWORDS },

         { (char *)"DC_GetLogicalOrigin", (PyCFunction) _wrap_DC_GetLogicalOrigin, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_GetLogicalOrigin", (PyCFunction) _wrap_DC_GetLogicalOrigin, METH_VARARGS | METH_KEYWORDS },

+        { (char *)"DC_GetLogicalOriginTuple", (PyCFunction) _wrap_DC_GetLogicalOriginTuple, METH_VARARGS | METH_KEYWORDS },

         { (char *)"DC_SetLogicalOrigin", (PyCFunction) _wrap_DC_SetLogicalOrigin, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetLogicalOrigin", (PyCFunction) _wrap_DC_SetLogicalOrigin, METH_VARARGS | METH_KEYWORDS },

-        { (char *)"DC_GetDeviceOriginTuple", (PyCFunction) _wrap_DC_GetDeviceOriginTuple, METH_VARARGS | METH_KEYWORDS },

         { (char *)"DC_GetDeviceOrigin", (PyCFunction) _wrap_DC_GetDeviceOrigin, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_GetDeviceOrigin", (PyCFunction) _wrap_DC_GetDeviceOrigin, METH_VARARGS | METH_KEYWORDS },

+        { (char *)"DC_GetDeviceOriginTuple", (PyCFunction) _wrap_DC_GetDeviceOriginTuple, METH_VARARGS | METH_KEYWORDS },

         { (char *)"DC_SetDeviceOrigin", (PyCFunction) _wrap_DC_SetDeviceOrigin, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetAxisOrientation", (PyCFunction) _wrap_DC_SetAxisOrientation, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_GetLogicalFunction", (PyCFunction) _wrap_DC_GetLogicalFunction, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetDeviceOrigin", (PyCFunction) _wrap_DC_SetDeviceOrigin, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_SetAxisOrientation", (PyCFunction) _wrap_DC_SetAxisOrientation, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DC_GetLogicalFunction", (PyCFunction) _wrap_DC_GetLogicalFunction, METH_VARARGS | METH_KEYWORDS },


@@ -16782,8 +18501,9 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS },
         { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS },
         { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS },
         { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS },
         { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS },
         { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS },

-        { (char *)"new_BufferedDC", (PyCFunction) _wrap_new_BufferedDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_BufferedDCInternalBuffer", (PyCFunction) _wrap_new_BufferedDCInternalBuffer, METH_VARARGS | METH_KEYWORDS },
+        { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS },
+        { (char *)"new_BufferedDCInternalBuffer", _wrap_new_BufferedDCInternalBuffer, METH_VARARGS },
+        { (char *)"delete_BufferedDC", (PyCFunction) _wrap_delete_BufferedDC, METH_VARARGS | METH_KEYWORDS },

         { (char *)"BufferedDC_UnMask", (PyCFunction) _wrap_BufferedDC_UnMask, METH_VARARGS | METH_KEYWORDS },
         { (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS },
         { (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS },
         { (char *)"BufferedDC_UnMask", (PyCFunction) _wrap_BufferedDC_UnMask, METH_VARARGS | METH_KEYWORDS },
         { (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS },
         { (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS },


@@ -16847,24 +18567,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"FontList_RemoveFont", (PyCFunction) _wrap_FontList_RemoveFont, METH_VARARGS | METH_KEYWORDS },
         { (char *)"FontList_GetCount", (PyCFunction) _wrap_FontList_GetCount, METH_VARARGS | METH_KEYWORDS },
         { (char *)"FontList_swigregister", FontList_swigregister, METH_VARARGS },
         { (char *)"FontList_RemoveFont", (PyCFunction) _wrap_FontList_RemoveFont, METH_VARARGS | METH_KEYWORDS },
         { (char *)"FontList_GetCount", (PyCFunction) _wrap_FontList_GetCount, METH_VARARGS | METH_KEYWORDS },
         { (char *)"FontList_swigregister", FontList_swigregister, METH_VARARGS },

-        { (char *)"new_DragImage", (PyCFunction) _wrap_new_DragImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_DragIcon", (PyCFunction) _wrap_new_DragIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_DragString", (PyCFunction) _wrap_new_DragString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_DragTreeItem", (PyCFunction) _wrap_new_DragTreeItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_DragListItem", (PyCFunction) _wrap_new_DragListItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_DragImage", (PyCFunction) _wrap_delete_DragImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DragImage_SetBackingBitmap", (PyCFunction) _wrap_DragImage_SetBackingBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DragImage_BeginDrag", (PyCFunction) _wrap_DragImage_BeginDrag, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DragImage_BeginDragBounded", (PyCFunction) _wrap_DragImage_BeginDragBounded, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DragImage_EndDrag", (PyCFunction) _wrap_DragImage_EndDrag, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DragImage_Move", (PyCFunction) _wrap_DragImage_Move, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DragImage_Show", (PyCFunction) _wrap_DragImage_Show, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DragImage_Hide", (PyCFunction) _wrap_DragImage_Hide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DragImage_GetImageRect", (PyCFunction) _wrap_DragImage_GetImageRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DragImage_DoDrawImage", (PyCFunction) _wrap_DragImage_DoDrawImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DragImage_UpdateBackingFromWindow", (PyCFunction) _wrap_DragImage_UpdateBackingFromWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DragImage_RedrawImage", (PyCFunction) _wrap_DragImage_RedrawImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DragImage_swigregister", DragImage_swigregister, METH_VARARGS },

         { (char *)"new_Effects", (PyCFunction) _wrap_new_Effects, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Effects_GetHighlightColour", (PyCFunction) _wrap_Effects_GetHighlightColour, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Effects_GetLightShadow", (PyCFunction) _wrap_Effects_GetLightShadow, METH_VARARGS | METH_KEYWORDS },
         { (char *)"new_Effects", (PyCFunction) _wrap_new_Effects, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Effects_GetHighlightColour", (PyCFunction) _wrap_Effects_GetHighlightColour, METH_VARARGS | METH_KEYWORDS },
         { (char *)"Effects_GetLightShadow", (PyCFunction) _wrap_Effects_GetLightShadow, METH_VARARGS | METH_KEYWORDS },


@@ -16886,78 +18588,21 @@ static PyMethodDef SwigMethods[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 

+static void *_p_wxControlTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *)  ((wxControl *) x));
+}
+static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x));
+}
+static void *_p_wxMenuBarTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *)  ((wxMenuBar *) x));
+}

 static void *_p_wxBufferedDCTo_p_wxMemoryDC(void *x) {
     return (void *)((wxMemoryDC *)  ((wxBufferedDC *) x));
 }
 static void *_p_wxBufferedPaintDCTo_p_wxMemoryDC(void *x) {
     return (void *)((wxMemoryDC *) (wxBufferedDC *) ((wxBufferedPaintDC *) x));
 }
 static void *_p_wxBufferedDCTo_p_wxMemoryDC(void *x) {
     return (void *)((wxMemoryDC *)  ((wxBufferedDC *) x));
 }
 static void *_p_wxBufferedPaintDCTo_p_wxMemoryDC(void *x) {
     return (void *)((wxMemoryDC *) (wxBufferedDC *) ((wxBufferedPaintDC *) x));
 }

-static void *_p_wxPyPenTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *) (wxPen *) ((wxPyPen *) x));
-}
-static void *_p_wxIconTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxIcon *) x));
-}
-static void *_p_wxPaletteTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxPalette *) x));
-}
-static void *_p_wxPenTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxPen *) x));
-}
-static void *_p_wxFontTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxFont *) x));
-}
-static void *_p_wxCursorTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxCursor *) x));
-}
-static void *_p_wxBitmapTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxBitmap *) x));
-}
-static void *_p_wxRegionTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxRegion *) x));
-}
-static void *_p_wxBrushTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxBrush *) x));
-}
-static void *_p_wxBufferedDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *) (wxMemoryDC *) ((wxBufferedDC *) x));
-}
-static void *_p_wxScreenDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxScreenDC *) x));
-}
-static void *_p_wxMirrorDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxMirrorDC *) x));
-}
-static void *_p_wxMemoryDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxMemoryDC *) x));
-}
-static void *_p_wxWindowDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxWindowDC *) x));
-}
-static void *_p_wxMetaFileDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxMetaFileDC *) x));
-}
-static void *_p_wxBufferedPaintDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x));
-}
-static void *_p_wxClientDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxClientDC *) x));
-}
-static void *_p_wxPaintDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxPaintDC *) x));
-}
-static void *_p_wxPostScriptDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxPostScriptDC *) x));
-}
-static void *_p_wxPrinterDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxPrinterDC *) x));
-}
-static void *_p_wxPyPenTo_p_wxPen(void *x) {
-    return (void *)((wxPen *)  ((wxPyPen *) x));
-}
-static void *_p_wxBufferedPaintDCTo_p_wxBufferedDC(void *x) {
-    return (void *)((wxBufferedDC *)  ((wxBufferedPaintDC *) x));
-}

 static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxLayoutConstraints *) x));
 }
 static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxLayoutConstraints *) x));
 }


@@ -17156,15 +18801,15 @@ static void *_p_wxPrinterDCTo_p_wxObject(void *x) {
 static void *_p_wxScreenDCTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxDC *) ((wxScreenDC *) x));
 }
 static void *_p_wxScreenDCTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxDC *) ((wxScreenDC *) x));
 }

+static void *_p_wxAcceleratorTableTo_p_wxObject(void *x) {
+    return (void *)((wxObject *)  ((wxAcceleratorTable *) x));
+}

 static void *_p_wxImageTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxImage *) x));
 }
 static void *_p_wxScrollWinEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxScrollWinEvent *) x));
 }
 static void *_p_wxImageTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxImage *) x));
 }
 static void *_p_wxScrollWinEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxScrollWinEvent *) x));
 }

-static void *_p_wxGenericDragImageTo_p_wxObject(void *x) {
-    return (void *)((wxObject *)  ((wxGenericDragImage *) x));
-}

 static void *_p_wxPaletteTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxGDIObject *) ((wxPalette *) x));
 }
 static void *_p_wxPaletteTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxGDIObject *) ((wxPalette *) x));
 }


@@ -17276,86 +18921,138 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) {
 static void *_p_wxValidatorTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x));
 }
 static void *_p_wxValidatorTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x));
 }

-static void *_p_wxControlTo_p_wxWindow(void *x) {
-    return (void *)((wxWindow *)  ((wxControl *) x));
+static void *_p_wxBufferedPaintDCTo_p_wxBufferedDC(void *x) {
+    return (void *)((wxBufferedDC *)  ((wxBufferedPaintDC *) x));

 }
 }

-static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) {
-    return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x));
+static void *_p_wxBufferedDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *) (wxMemoryDC *) ((wxBufferedDC *) x));

 }
 }

-static void *_p_wxMenuBarTo_p_wxWindow(void *x) {
-    return (void *)((wxWindow *)  ((wxMenuBar *) x));
+static void *_p_wxScreenDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxScreenDC *) x));
+}
+static void *_p_wxMirrorDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxMirrorDC *) x));
+}
+static void *_p_wxMemoryDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxMemoryDC *) x));
+}
+static void *_p_wxWindowDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxWindowDC *) x));
+}
+static void *_p_wxMetaFileDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxMetaFileDC *) x));
+}
+static void *_p_wxBufferedPaintDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x));
+}
+static void *_p_wxClientDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxClientDC *) x));
+}
+static void *_p_wxPaintDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxPaintDC *) x));
+}
+static void *_p_wxPostScriptDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxPostScriptDC *) x));
+}
+static void *_p_wxPrinterDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxPrinterDC *) x));

 }
 }

-static swig_type_info _swigt__p_wxPostScriptDC[] = {{"_p_wxPostScriptDC", 0, "wxPostScriptDC *", 0},{"_p_wxPostScriptDC"},{0}};
-static swig_type_info _swigt__p_wxGenericDragImage[] = {{"_p_wxGenericDragImage", 0, "wxGenericDragImage *", 0},{"_p_wxGenericDragImage"},{0}};
-static swig_type_info _swigt__p_wxBrush[] = {{"_p_wxBrush", 0, "wxBrush *", 0},{"_p_wxBrush"},{0}};
-static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0},{"_p_wxColour"},{0}};
-static swig_type_info _swigt__p_wxCoord[] = {{"_p_wxCoord", 0, "wxCoord *", 0},{"_p_wxCoord"},{"_p_int"},{0}};
-static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxDC},{"_p_wxScreenDC", _p_wxScreenDCTo_p_wxDC},{"_p_wxMirrorDC", _p_wxMirrorDCTo_p_wxDC},{"_p_wxMemoryDC", _p_wxMemoryDCTo_p_wxDC},{"_p_wxWindowDC", _p_wxWindowDCTo_p_wxDC},{"_p_wxDC"},{"_p_wxMetaFileDC", _p_wxMetaFileDCTo_p_wxDC},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxDC},{"_p_wxClientDC", _p_wxClientDCTo_p_wxDC},{"_p_wxPaintDC", _p_wxPaintDCTo_p_wxDC},{"_p_wxPostScriptDC", _p_wxPostScriptDCTo_p_wxDC},{"_p_wxPrinterDC", _p_wxPrinterDCTo_p_wxDC},{0}};
-static swig_type_info _swigt__p_wxMirrorDC[] = {{"_p_wxMirrorDC", 0, "wxMirrorDC *", 0},{"_p_wxMirrorDC"},{0}};
-static swig_type_info _swigt__p_byte[] = {{"_p_byte", 0, "byte *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}};
-static swig_type_info _swigt__p_wxPyFontEnumerator[] = {{"_p_wxPyFontEnumerator", 0, "wxPyFontEnumerator *", 0},{"_p_wxPyFontEnumerator"},{0}};
-static swig_type_info _swigt__p_wxIconLocation[] = {{"_p_wxIconLocation", 0, "wxIconLocation *", 0},{"_p_wxIconLocation"},{0}};
-static swig_type_info _swigt__p_wxImage[] = {{"_p_wxImage", 0, "wxImage *", 0},{"_p_wxImage"},{0}};
-static swig_type_info _swigt__p_wxMetaFileDC[] = {{"_p_wxMetaFileDC", 0, "wxMetaFileDC *", 0},{"_p_wxMetaFileDC"},{0}};
-static swig_type_info _swigt__p_wxMask[] = {{"_p_wxMask", 0, "wxMask *", 0},{"_p_wxMask"},{0}};
-static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}};
-static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{0}};
-static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0},{"_p_wxSize"},{0}};
-static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0},{"_p_double"},{0}};
-static swig_type_info _swigt__p_wxMemoryDC[] = {{"_p_wxMemoryDC", 0, "wxMemoryDC *", 0},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxMemoryDC},{"_p_wxMemoryDC"},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxMemoryDC},{0}};
-static swig_type_info _swigt__p_wxFontMapper[] = {{"_p_wxFontMapper", 0, "wxFontMapper *", 0},{"_p_wxFontMapper"},{0}};
-static swig_type_info _swigt__p_wxListCtrl[] = {{"_p_wxListCtrl", 0, "wxListCtrl *", 0},{"_p_wxListCtrl"},{0}};
-static swig_type_info _swigt__p_wxEffects[] = {{"_p_wxEffects", 0, "wxEffects *", 0},{"_p_wxEffects"},{0}};
-static swig_type_info _swigt__p_wxNativeEncodingInfo[] = {{"_p_wxNativeEncodingInfo", 0, "wxNativeEncodingInfo *", 0},{"_p_wxNativeEncodingInfo"},{0}};
-static swig_type_info _swigt__p_wxPalette[] = {{"_p_wxPalette", 0, "wxPalette *", 0},{"_p_wxPalette"},{0}};
-static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}};
-static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxRegionIterator", _p_wxRegionIteratorTo_p_wxObject},{"_p_wxPen", _p_wxPenTo_p_wxObject},{"_p_wxColourDatabase", _p_wxColourDatabaseTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxPenList", _p_wxPenListTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxMask", _p_wxMaskTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxFont", _p_wxFontTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxClientDC", _p_wxClientDCTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxMemoryDC", _p_wxMemoryDCTo_p_wxObject},{"_p_wxRegion", _p_wxRegionTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxDC", _p_wxDCTo_p_wxObject},{"_p_wxIcon", _p_wxIconTo_p_wxObject},{"_p_wxWindowDC", _p_wxWindowDCTo_p_wxObject},{"_p_wxGDIObject", _p_wxGDIObjectTo_p_wxObject},{"_p_wxEffects", _p_wxEffectsTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPostScriptDC", _p_wxPostScriptDCTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxPaintDC", _p_wxPaintDCTo_p_wxObject},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxObject},{"_p_wxPrinterDC", _p_wxPrinterDCTo_p_wxObject},{"_p_wxScreenDC", _p_wxScreenDCTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxObject},{"_p_wxPalette", _p_wxPaletteTo_p_wxObject},{"_p_wxImageList", _p_wxImageListTo_p_wxObject},{"_p_wxCursor", _p_wxCursorTo_p_wxObject},{"_p_wxObject"},{"_p_wxMirrorDC", _p_wxMirrorDCTo_p_wxObject},{"_p_wxEncodingConverter", _p_wxEncodingConverterTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxMetaFileDC", _p_wxMetaFileDCTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxBrushList", _p_wxBrushListTo_p_wxObject},{"_p_wxPyPen", _p_wxPyPenTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxBitmap", _p_wxBitmapTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxBrush", _p_wxBrushTo_p_wxObject},{"_p_wxMetaFile", _p_wxMetaFileTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxColour", _p_wxColourTo_p_wxObject},{"_p_wxFontList", _p_wxFontListTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{0}};
-static swig_type_info _swigt__p_wxRegionIterator[] = {{"_p_wxRegionIterator", 0, "wxRegionIterator *", 0},{"_p_wxRegionIterator"},{0}};
-static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p_wxRect"},{0}};
-static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}};
-static swig_type_info _swigt__p_wxPrinterDC[] = {{"_p_wxPrinterDC", 0, "wxPrinterDC *", 0},{"_p_wxPrinterDC"},{0}};
-static swig_type_info _swigt__p_wxIconBundle[] = {{"_p_wxIconBundle", 0, "wxIconBundle *", 0},{"_p_wxIconBundle"},{0}};
-static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{"_p_wxPoint"},{0}};
-static swig_type_info _swigt__p_wxDash[] = {{"_p_wxDash", 0, "wxDash *", 0},{"_p_wxDash"},{0}};
-static swig_type_info _swigt__p_wxScreenDC[] = {{"_p_wxScreenDC", 0, "wxScreenDC *", 0},{"_p_wxScreenDC"},{0}};
-static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0},{"_p_wxCursor"},{0}};
-static swig_type_info _swigt__p_wxClientDC[] = {{"_p_wxClientDC", 0, "wxClientDC *", 0},{"_p_wxClientDC"},{0}};
-static swig_type_info _swigt__p_wxTreeCtrl[] = {{"_p_wxTreeCtrl", 0, "wxTreeCtrl *", 0},{"_p_wxTreeCtrl"},{0}};
-static swig_type_info _swigt__p_wxBufferedDC[] = {{"_p_wxBufferedDC", 0, "wxBufferedDC *", 0},{"_p_wxBufferedDC"},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxBufferedDC},{0}};
-static swig_type_info _swigt__p_wxImageList[] = {{"_p_wxImageList", 0, "wxImageList *", 0},{"_p_wxImageList"},{0}};
-static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}};
-static swig_type_info _swigt__p_wxGDIObject[] = {{"_p_wxGDIObject", 0, "wxGDIObject *", 0},{"_p_wxIcon", _p_wxIconTo_p_wxGDIObject},{"_p_wxPyPen", _p_wxPyPenTo_p_wxGDIObject},{"_p_wxPen", _p_wxPenTo_p_wxGDIObject},{"_p_wxFont", _p_wxFontTo_p_wxGDIObject},{"_p_wxPalette", _p_wxPaletteTo_p_wxGDIObject},{"_p_wxGDIObject"},{"_p_wxCursor", _p_wxCursorTo_p_wxGDIObject},{"_p_wxBitmap", _p_wxBitmapTo_p_wxGDIObject},{"_p_wxRegion", _p_wxRegionTo_p_wxGDIObject},{"_p_wxBrush", _p_wxBrushTo_p_wxGDIObject},{0}};
-static swig_type_info _swigt__p_wxLocale[] = {{"_p_wxLocale", 0, "wxLocale *", 0},{"_p_wxLocale"},{0}};
-static swig_type_info _swigt__p_wxIcon[] = {{"_p_wxIcon", 0, "wxIcon *", 0},{"_p_wxIcon"},{0}};
-static swig_type_info _swigt__p_wxRegion[] = {{"_p_wxRegion", 0, "wxRegion *", 0},{"_p_wxRegion"},{0}};
-static swig_type_info _swigt__p_wxLanguageInfo[] = {{"_p_wxLanguageInfo", 0, "wxLanguageInfo *", 0},{"_p_wxLanguageInfo"},{0}};
-static swig_type_info _swigt__p_wxConfigBase[] = {{"_p_wxConfigBase", 0, "wxConfigBase *", 0},{"_p_wxConfigBase"},{0}};
-static swig_type_info _swigt__p_wxWindowDC[] = {{"_p_wxWindowDC", 0, "wxWindowDC *", 0},{"_p_wxWindowDC"},{0}};
-static swig_type_info _swigt__p_wxPrintData[] = {{"_p_wxPrintData", 0, "wxPrintData *", 0},{"_p_wxPrintData"},{0}};
-static swig_type_info _swigt__p_wxBrushList[] = {{"_p_wxBrushList", 0, "wxBrushList *", 0},{"_p_wxBrushList"},{0}};
-static swig_type_info _swigt__p_wxFontList[] = {{"_p_wxFontList", 0, "wxFontList *", 0},{"_p_wxFontList"},{0}};
-static swig_type_info _swigt__p_wxPen[] = {{"_p_wxPen", 0, "wxPen *", 0},{"_p_wxPyPen", _p_wxPyPenTo_p_wxPen},{"_p_wxPen"},{0}};
-static swig_type_info _swigt__p_wxBufferedPaintDC[] = {{"_p_wxBufferedPaintDC", 0, "wxBufferedPaintDC *", 0},{"_p_wxBufferedPaintDC"},{0}};
-static swig_type_info _swigt__p_wxPaintDC[] = {{"_p_wxPaintDC", 0, "wxPaintDC *", 0},{"_p_wxPaintDC"},{0}};
-static swig_type_info _swigt__p_wxPenList[] = {{"_p_wxPenList", 0, "wxPenList *", 0},{"_p_wxPenList"},{0}};
-static swig_type_info _swigt__p_wxTreeItemId[] = {{"_p_wxTreeItemId", 0, "wxTreeItemId *", 0},{"_p_wxTreeItemId"},{0}};
-static swig_type_info _swigt__p_wxPyPen[] = {{"_p_wxPyPen", 0, "wxPyPen *", 0},{"_p_wxPyPen"},{0}};
-static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_wxCoord"},{"_p_int"},{0}};
-static swig_type_info _swigt__p_wxMetaFile[] = {{"_p_wxMetaFile", 0, "wxMetaFile *", 0},{"_p_wxMetaFile"},{0}};
-static swig_type_info _swigt__p_wxNativeFontInfo[] = {{"_p_wxNativeFontInfo", 0, "wxNativeFontInfo *", 0},{"_p_wxNativeFontInfo"},{0}};
-static swig_type_info _swigt__p_wxEncodingConverter[] = {{"_p_wxEncodingConverter", 0, "wxEncodingConverter *", 0},{"_p_wxEncodingConverter"},{0}};
-static swig_type_info _swigt__p_wxColourDatabase[] = {{"_p_wxColourDatabase", 0, "wxColourDatabase *", 0},{"_p_wxColourDatabase"},{0}};
+static void *_p_wxPyPenTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *) (wxPen *) ((wxPyPen *) x));
+}
+static void *_p_wxIconTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxIcon *) x));
+}
+static void *_p_wxPaletteTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxPalette *) x));
+}
+static void *_p_wxPenTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxPen *) x));
+}
+static void *_p_wxFontTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxFont *) x));
+}
+static void *_p_wxCursorTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxCursor *) x));
+}
+static void *_p_wxBitmapTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxBitmap *) x));
+}
+static void *_p_wxRegionTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxRegion *) x));
+}
+static void *_p_wxBrushTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxBrush *) x));
+}
+static void *_p_wxPyPenTo_p_wxPen(void *x) {
+    return (void *)((wxPen *)  ((wxPyPen *) x));
+}
+static swig_type_info _swigt__p_wxPostScriptDC[] = {{"_p_wxPostScriptDC", 0, "wxPostScriptDC *", 0, 0, 0, 0},{"_p_wxPostScriptDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxBrush[] = {{"_p_wxBrush", 0, "wxBrush *", 0, 0, 0, 0},{"_p_wxBrush", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0, 0, 0, 0},{"_p_wxColour", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0, 0, 0, 0},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxDC, 0, 0, 0, 0, 0},{"_p_wxScreenDC", _p_wxScreenDCTo_p_wxDC, 0, 0, 0, 0, 0},{"_p_wxMirrorDC", _p_wxMirrorDCTo_p_wxDC, 0, 0, 0, 0, 0},{"_p_wxMemoryDC", _p_wxMemoryDCTo_p_wxDC, 0, 0, 0, 0, 0},{"_p_wxWindowDC", _p_wxWindowDCTo_p_wxDC, 0, 0, 0, 0, 0},{"_p_wxDC", 0, 0, 0, 0, 0, 0},{"_p_wxMetaFileDC", _p_wxMetaFileDCTo_p_wxDC, 0, 0, 0, 0, 0},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxDC, 0, 0, 0, 0, 0},{"_p_wxClientDC", _p_wxClientDCTo_p_wxDC, 0, 0, 0, 0, 0},{"_p_wxPaintDC", _p_wxPaintDCTo_p_wxDC, 0, 0, 0, 0, 0},{"_p_wxPostScriptDC", _p_wxPostScriptDCTo_p_wxDC, 0, 0, 0, 0, 0},{"_p_wxPrinterDC", _p_wxPrinterDCTo_p_wxDC, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxMirrorDC[] = {{"_p_wxMirrorDC", 0, "wxMirrorDC *", 0, 0, 0, 0},{"_p_wxMirrorDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_byte[] = {{"_p_byte", 0, "unsigned char *|byte *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{"_p_byte", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyFontEnumerator[] = {{"_p_wxPyFontEnumerator", 0, "wxPyFontEnumerator *", 0, 0, 0, 0},{"_p_wxPyFontEnumerator", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxIconLocation[] = {{"_p_wxIconLocation", 0, "wxIconLocation *", 0, 0, 0, 0},{"_p_wxIconLocation", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxImage[] = {{"_p_wxImage", 0, "wxImage *", 0, 0, 0, 0},{"_p_wxImage", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxMetaFileDC[] = {{"_p_wxMetaFileDC", 0, "wxMetaFileDC *", 0, 0, 0, 0},{"_p_wxMetaFileDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxMask[] = {{"_p_wxMask", 0, "wxMask *", 0, 0, 0, 0},{"_p_wxMask", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0, 0, 0, 0},{"_p_wxFont", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0, 0, 0, 0},{"_p_wxSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0, 0, 0, 0},{"_p_double", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxMemoryDC[] = {{"_p_wxMemoryDC", 0, "wxMemoryDC *", 0, 0, 0, 0},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxMemoryDC, 0, 0, 0, 0, 0},{"_p_wxMemoryDC", 0, 0, 0, 0, 0, 0},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxMemoryDC, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxFontMapper[] = {{"_p_wxFontMapper", 0, "wxFontMapper *", 0, 0, 0, 0},{"_p_wxFontMapper", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxEffects[] = {{"_p_wxEffects", 0, "wxEffects *", 0, 0, 0, 0},{"_p_wxEffects", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxNativeEncodingInfo[] = {{"_p_wxNativeEncodingInfo", 0, "wxNativeEncodingInfo *", 0, 0, 0, 0},{"_p_wxNativeEncodingInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPalette[] = {{"_p_wxPalette", 0, "wxPalette *", 0, 0, 0, 0},{"_p_wxPalette", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0, 0, 0, 0},{"_p_wxBitmap", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRegionIterator", _p_wxRegionIteratorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPen", _p_wxPenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDatabase", _p_wxColourDatabaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPenList", _p_wxPenListTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMask", _p_wxMaskTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFont", _p_wxFontTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxClientDC", _p_wxClientDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMemoryDC", _p_wxMemoryDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRegion", _p_wxRegionTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDC", _p_wxDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIcon", _p_wxIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDC", _p_wxWindowDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGDIObject", _p_wxGDIObjectTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEffects", _p_wxEffectsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPostScriptDC", _p_wxPostScriptDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintDC", _p_wxPaintDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinterDC", _p_wxPrinterDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScreenDC", _p_wxScreenDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPalette", _p_wxPaletteTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageList", _p_wxImageListTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCursor", _p_wxCursorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxMirrorDC", _p_wxMirrorDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEncodingConverter", _p_wxEncodingConverterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMetaFileDC", _p_wxMetaFileDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBrushList", _p_wxBrushListTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPen", _p_wxPyPenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBitmap", _p_wxBitmapTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBrush", _p_wxBrushTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMetaFile", _p_wxMetaFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColour", _p_wxColourTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontList", _p_wxFontListTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxRegionIterator[] = {{"_p_wxRegionIterator", 0, "wxRegionIterator *", 0, 0, 0, 0},{"_p_wxRegionIterator", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0, 0, 0, 0},{"_p_wxRect", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0, 0, 0, 0},{"_p_wxString", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPrinterDC[] = {{"_p_wxPrinterDC", 0, "wxPrinterDC *", 0, 0, 0, 0},{"_p_wxPrinterDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxIconBundle[] = {{"_p_wxIconBundle", 0, "wxIconBundle *", 0, 0, 0, 0},{"_p_wxIconBundle", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxDash[] = {{"_p_wxDash", 0, "wxDash *", 0, 0, 0, 0},{"_p_wxDash", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxScreenDC[] = {{"_p_wxScreenDC", 0, "wxScreenDC *", 0, 0, 0, 0},{"_p_wxScreenDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0, 0, 0, 0},{"_p_wxCursor", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxClientDC[] = {{"_p_wxClientDC", 0, "wxClientDC *", 0, 0, 0, 0},{"_p_wxClientDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxBufferedDC[] = {{"_p_wxBufferedDC", 0, "wxBufferedDC *", 0, 0, 0, 0},{"_p_wxBufferedDC", 0, 0, 0, 0, 0, 0},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxBufferedDC, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxImageList[] = {{"_p_wxImageList", 0, "wxImageList *", 0, 0, 0, 0},{"_p_wxImageList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{"_p_byte", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxGDIObject[] = {{"_p_wxGDIObject", 0, "wxGDIObject *", 0, 0, 0, 0},{"_p_wxIcon", _p_wxIconTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxPyPen", _p_wxPyPenTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxPen", _p_wxPenTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxFont", _p_wxFontTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxPalette", _p_wxPaletteTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxGDIObject", 0, 0, 0, 0, 0, 0},{"_p_wxCursor", _p_wxCursorTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxBitmap", _p_wxBitmapTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxRegion", _p_wxRegionTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxBrush", _p_wxBrushTo_p_wxGDIObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxIcon[] = {{"_p_wxIcon", 0, "wxIcon *", 0, 0, 0, 0},{"_p_wxIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxLocale[] = {{"_p_wxLocale", 0, "wxLocale *", 0, 0, 0, 0},{"_p_wxLocale", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxRegion[] = {{"_p_wxRegion", 0, "wxRegion *", 0, 0, 0, 0},{"_p_wxRegion", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxLanguageInfo[] = {{"_p_wxLanguageInfo", 0, "wxLanguageInfo *", 0, 0, 0, 0},{"_p_wxLanguageInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxConfigBase[] = {{"_p_wxConfigBase", 0, "wxConfigBase *", 0, 0, 0, 0},{"_p_wxConfigBase", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxWindowDC[] = {{"_p_wxWindowDC", 0, "wxWindowDC *", 0, 0, 0, 0},{"_p_wxWindowDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPrintData[] = {{"_p_wxPrintData", 0, "wxPrintData *", 0, 0, 0, 0},{"_p_wxPrintData", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxBrushList[] = {{"_p_wxBrushList", 0, "wxBrushList *", 0, 0, 0, 0},{"_p_wxBrushList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxFontList[] = {{"_p_wxFontList", 0, "wxFontList *", 0, 0, 0, 0},{"_p_wxFontList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPen[] = {{"_p_wxPen", 0, "wxPen *", 0, 0, 0, 0},{"_p_wxPyPen", _p_wxPyPenTo_p_wxPen, 0, 0, 0, 0, 0},{"_p_wxPen", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxBufferedPaintDC[] = {{"_p_wxBufferedPaintDC", 0, "wxBufferedPaintDC *", 0, 0, 0, 0},{"_p_wxBufferedPaintDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPaintDC[] = {{"_p_wxPaintDC", 0, "wxPaintDC *", 0, 0, 0, 0},{"_p_wxPaintDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPenList[] = {{"_p_wxPenList", 0, "wxPenList *", 0, 0, 0, 0},{"_p_wxPenList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyPen[] = {{"_p_wxPyPen", 0, "wxPyPen *", 0, 0, 0, 0},{"_p_wxPyPen", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxMetaFile[] = {{"_p_wxMetaFile", 0, "wxMetaFile *", 0, 0, 0, 0},{"_p_wxMetaFile", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxNativeFontInfo[] = {{"_p_wxNativeFontInfo", 0, "wxNativeFontInfo *", 0, 0, 0, 0},{"_p_wxNativeFontInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxEncodingConverter[] = {{"_p_wxEncodingConverter", 0, "wxEncodingConverter *", 0, 0, 0, 0},{"_p_wxEncodingConverter", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxColourDatabase[] = {{"_p_wxColourDatabase", 0, "wxColourDatabase *", 0, 0, 0, 0},{"_p_wxColourDatabase", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};

 
 static swig_type_info *swig_types_initial[] = {
 _swigt__p_wxPostScriptDC, 
 
 static swig_type_info *swig_types_initial[] = {
 _swigt__p_wxPostScriptDC, 

-_swigt__p_wxGenericDragImage, 

 _swigt__p_wxBrush, 
 _swigt__p_wxColour, 
 _swigt__p_wxBrush, 
 _swigt__p_wxColour, 

-_swigt__p_wxCoord, 

 _swigt__p_wxDC, 
 _swigt__p_wxMirrorDC, 
 _swigt__p_byte, 
 _swigt__p_wxPyFontEnumerator, 
 _swigt__p_wxDC, 
 _swigt__p_wxMirrorDC, 
 _swigt__p_byte, 
 _swigt__p_wxPyFontEnumerator, 

+_swigt__p_char, 

 _swigt__p_wxIconLocation, 
 _swigt__p_wxImage, 
 _swigt__p_wxMetaFileDC, 
 _swigt__p_wxIconLocation, 
 _swigt__p_wxImage, 
 _swigt__p_wxMetaFileDC, 


@@ -17366,7 +19063,6 @@ _swigt__p_wxSize,
 _swigt__p_double, 
 _swigt__p_wxMemoryDC, 
 _swigt__p_wxFontMapper, 
 _swigt__p_double, 
 _swigt__p_wxMemoryDC, 
 _swigt__p_wxFontMapper, 

-_swigt__p_wxListCtrl, 

 _swigt__p_wxEffects, 
 _swigt__p_wxNativeEncodingInfo, 
 _swigt__p_wxPalette, 
 _swigt__p_wxEffects, 
 _swigt__p_wxNativeEncodingInfo, 
 _swigt__p_wxPalette, 


@@ -17382,13 +19078,12 @@ _swigt__p_wxDash,
 _swigt__p_wxScreenDC, 
 _swigt__p_wxCursor, 
 _swigt__p_wxClientDC, 
 _swigt__p_wxScreenDC, 
 _swigt__p_wxCursor, 
 _swigt__p_wxClientDC, 

-_swigt__p_wxTreeCtrl, 

 _swigt__p_wxBufferedDC, 
 _swigt__p_wxImageList, 
 _swigt__p_unsigned_char, 
 _swigt__p_wxGDIObject, 
 _swigt__p_wxBufferedDC, 
 _swigt__p_wxImageList, 
 _swigt__p_unsigned_char, 
 _swigt__p_wxGDIObject, 

-_swigt__p_wxLocale, 

 _swigt__p_wxIcon, 
 _swigt__p_wxIcon, 

+_swigt__p_wxLocale, 

 _swigt__p_wxRegion, 
 _swigt__p_wxLanguageInfo, 
 _swigt__p_wxConfigBase, 
 _swigt__p_wxRegion, 
 _swigt__p_wxLanguageInfo, 
 _swigt__p_wxConfigBase, 


@@ -17400,7 +19095,6 @@ _swigt__p_wxPen,
 _swigt__p_wxBufferedPaintDC, 
 _swigt__p_wxPaintDC, 
 _swigt__p_wxPenList, 
 _swigt__p_wxBufferedPaintDC, 
 _swigt__p_wxPaintDC, 
 _swigt__p_wxPenList, 

-_swigt__p_wxTreeItemId, 

 _swigt__p_wxPyPen, 
 _swigt__p_int, 
 _swigt__p_wxMetaFile, 
 _swigt__p_wxPyPen, 
 _swigt__p_int, 
 _swigt__p_wxMetaFile, 


@@ -17414,343 +19108,6 @@ _swigt__p_wxColourDatabase,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {

-{ SWIG_PY_INT,     (char *)"OutRegion", (long) wxOutRegion, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"PartRegion", (long) wxPartRegion, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"InRegion", (long) wxInRegion, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFAMILY_DEFAULT", (long) wxFONTFAMILY_DEFAULT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFAMILY_DECORATIVE", (long) wxFONTFAMILY_DECORATIVE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFAMILY_ROMAN", (long) wxFONTFAMILY_ROMAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFAMILY_SCRIPT", (long) wxFONTFAMILY_SCRIPT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFAMILY_SWISS", (long) wxFONTFAMILY_SWISS, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFAMILY_MODERN", (long) wxFONTFAMILY_MODERN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFAMILY_TELETYPE", (long) wxFONTFAMILY_TELETYPE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFAMILY_MAX", (long) wxFONTFAMILY_MAX, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFAMILY_UNKNOWN", (long) wxFONTFAMILY_UNKNOWN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTSTYLE_NORMAL", (long) wxFONTSTYLE_NORMAL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTSTYLE_ITALIC", (long) wxFONTSTYLE_ITALIC, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTSTYLE_SLANT", (long) wxFONTSTYLE_SLANT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTSTYLE_MAX", (long) wxFONTSTYLE_MAX, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTWEIGHT_NORMAL", (long) wxFONTWEIGHT_NORMAL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTWEIGHT_LIGHT", (long) wxFONTWEIGHT_LIGHT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTWEIGHT_BOLD", (long) wxFONTWEIGHT_BOLD, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTWEIGHT_MAX", (long) wxFONTWEIGHT_MAX, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFLAG_DEFAULT", (long) wxFONTFLAG_DEFAULT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFLAG_ITALIC", (long) wxFONTFLAG_ITALIC, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFLAG_SLANT", (long) wxFONTFLAG_SLANT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFLAG_LIGHT", (long) wxFONTFLAG_LIGHT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFLAG_BOLD", (long) wxFONTFLAG_BOLD, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFLAG_ANTIALIASED", (long) wxFONTFLAG_ANTIALIASED, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFLAG_NOT_ANTIALIASED", (long) wxFONTFLAG_NOT_ANTIALIASED, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFLAG_UNDERLINED", (long) wxFONTFLAG_UNDERLINED, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFLAG_STRIKETHROUGH", (long) wxFONTFLAG_STRIKETHROUGH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTFLAG_MASK", (long) wxFONTFLAG_MASK, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_SYSTEM", (long) wxFONTENCODING_SYSTEM, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_DEFAULT", (long) wxFONTENCODING_DEFAULT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_1", (long) wxFONTENCODING_ISO8859_1, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_2", (long) wxFONTENCODING_ISO8859_2, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_3", (long) wxFONTENCODING_ISO8859_3, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_4", (long) wxFONTENCODING_ISO8859_4, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_5", (long) wxFONTENCODING_ISO8859_5, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_6", (long) wxFONTENCODING_ISO8859_6, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_7", (long) wxFONTENCODING_ISO8859_7, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_8", (long) wxFONTENCODING_ISO8859_8, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_9", (long) wxFONTENCODING_ISO8859_9, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_10", (long) wxFONTENCODING_ISO8859_10, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_11", (long) wxFONTENCODING_ISO8859_11, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_12", (long) wxFONTENCODING_ISO8859_12, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_13", (long) wxFONTENCODING_ISO8859_13, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_14", (long) wxFONTENCODING_ISO8859_14, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_15", (long) wxFONTENCODING_ISO8859_15, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ISO8859_MAX", (long) wxFONTENCODING_ISO8859_MAX, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_KOI8", (long) wxFONTENCODING_KOI8, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_ALTERNATIVE", (long) wxFONTENCODING_ALTERNATIVE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_BULGARIAN", (long) wxFONTENCODING_BULGARIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP437", (long) wxFONTENCODING_CP437, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP850", (long) wxFONTENCODING_CP850, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP852", (long) wxFONTENCODING_CP852, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP855", (long) wxFONTENCODING_CP855, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP866", (long) wxFONTENCODING_CP866, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP874", (long) wxFONTENCODING_CP874, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP932", (long) wxFONTENCODING_CP932, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP936", (long) wxFONTENCODING_CP936, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP949", (long) wxFONTENCODING_CP949, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP950", (long) wxFONTENCODING_CP950, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP1250", (long) wxFONTENCODING_CP1250, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP1251", (long) wxFONTENCODING_CP1251, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP1252", (long) wxFONTENCODING_CP1252, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP1253", (long) wxFONTENCODING_CP1253, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP1254", (long) wxFONTENCODING_CP1254, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP1255", (long) wxFONTENCODING_CP1255, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP1256", (long) wxFONTENCODING_CP1256, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP1257", (long) wxFONTENCODING_CP1257, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_CP12_MAX", (long) wxFONTENCODING_CP12_MAX, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_UTF7", (long) wxFONTENCODING_UTF7, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_UTF8", (long) wxFONTENCODING_UTF8, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_EUC_JP", (long) wxFONTENCODING_EUC_JP, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_UTF16BE", (long) wxFONTENCODING_UTF16BE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_UTF16LE", (long) wxFONTENCODING_UTF16LE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_UTF32BE", (long) wxFONTENCODING_UTF32BE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_UTF32LE", (long) wxFONTENCODING_UTF32LE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_MAX", (long) wxFONTENCODING_MAX, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_UTF16", (long) wxFONTENCODING_UTF16, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_UTF32", (long) wxFONTENCODING_UTF32, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_UNICODE", (long) wxFONTENCODING_UNICODE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_GB2312", (long) wxFONTENCODING_GB2312, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_BIG5", (long) wxFONTENCODING_BIG5, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FONTENCODING_SHIFT_JIS", (long) wxFONTENCODING_SHIFT_JIS, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_DEFAULT", (long) wxLANGUAGE_DEFAULT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_UNKNOWN", (long) wxLANGUAGE_UNKNOWN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ABKHAZIAN", (long) wxLANGUAGE_ABKHAZIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_AFAR", (long) wxLANGUAGE_AFAR, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_AFRIKAANS", (long) wxLANGUAGE_AFRIKAANS, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ALBANIAN", (long) wxLANGUAGE_ALBANIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_AMHARIC", (long) wxLANGUAGE_AMHARIC, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC", (long) wxLANGUAGE_ARABIC, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_ALGERIA", (long) wxLANGUAGE_ARABIC_ALGERIA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_BAHRAIN", (long) wxLANGUAGE_ARABIC_BAHRAIN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_EGYPT", (long) wxLANGUAGE_ARABIC_EGYPT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_IRAQ", (long) wxLANGUAGE_ARABIC_IRAQ, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_JORDAN", (long) wxLANGUAGE_ARABIC_JORDAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_KUWAIT", (long) wxLANGUAGE_ARABIC_KUWAIT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_LEBANON", (long) wxLANGUAGE_ARABIC_LEBANON, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_LIBYA", (long) wxLANGUAGE_ARABIC_LIBYA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_MOROCCO", (long) wxLANGUAGE_ARABIC_MOROCCO, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_OMAN", (long) wxLANGUAGE_ARABIC_OMAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_QATAR", (long) wxLANGUAGE_ARABIC_QATAR, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_SAUDI_ARABIA", (long) wxLANGUAGE_ARABIC_SAUDI_ARABIA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_SUDAN", (long) wxLANGUAGE_ARABIC_SUDAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_SYRIA", (long) wxLANGUAGE_ARABIC_SYRIA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_TUNISIA", (long) wxLANGUAGE_ARABIC_TUNISIA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_UAE", (long) wxLANGUAGE_ARABIC_UAE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARABIC_YEMEN", (long) wxLANGUAGE_ARABIC_YEMEN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ARMENIAN", (long) wxLANGUAGE_ARMENIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ASSAMESE", (long) wxLANGUAGE_ASSAMESE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_AYMARA", (long) wxLANGUAGE_AYMARA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_AZERI", (long) wxLANGUAGE_AZERI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_AZERI_CYRILLIC", (long) wxLANGUAGE_AZERI_CYRILLIC, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_AZERI_LATIN", (long) wxLANGUAGE_AZERI_LATIN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_BASHKIR", (long) wxLANGUAGE_BASHKIR, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_BASQUE", (long) wxLANGUAGE_BASQUE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_BELARUSIAN", (long) wxLANGUAGE_BELARUSIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_BENGALI", (long) wxLANGUAGE_BENGALI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_BHUTANI", (long) wxLANGUAGE_BHUTANI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_BIHARI", (long) wxLANGUAGE_BIHARI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_BISLAMA", (long) wxLANGUAGE_BISLAMA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_BRETON", (long) wxLANGUAGE_BRETON, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_BULGARIAN", (long) wxLANGUAGE_BULGARIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_BURMESE", (long) wxLANGUAGE_BURMESE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_CAMBODIAN", (long) wxLANGUAGE_CAMBODIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_CATALAN", (long) wxLANGUAGE_CATALAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_CHINESE", (long) wxLANGUAGE_CHINESE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_CHINESE_SIMPLIFIED", (long) wxLANGUAGE_CHINESE_SIMPLIFIED, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_CHINESE_TRADITIONAL", (long) wxLANGUAGE_CHINESE_TRADITIONAL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_CHINESE_HONGKONG", (long) wxLANGUAGE_CHINESE_HONGKONG, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_CHINESE_MACAU", (long) wxLANGUAGE_CHINESE_MACAU, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_CHINESE_SINGAPORE", (long) wxLANGUAGE_CHINESE_SINGAPORE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_CHINESE_TAIWAN", (long) wxLANGUAGE_CHINESE_TAIWAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_CORSICAN", (long) wxLANGUAGE_CORSICAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_CROATIAN", (long) wxLANGUAGE_CROATIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_CZECH", (long) wxLANGUAGE_CZECH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_DANISH", (long) wxLANGUAGE_DANISH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_DUTCH", (long) wxLANGUAGE_DUTCH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_DUTCH_BELGIAN", (long) wxLANGUAGE_DUTCH_BELGIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH", (long) wxLANGUAGE_ENGLISH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_UK", (long) wxLANGUAGE_ENGLISH_UK, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_US", (long) wxLANGUAGE_ENGLISH_US, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_AUSTRALIA", (long) wxLANGUAGE_ENGLISH_AUSTRALIA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_BELIZE", (long) wxLANGUAGE_ENGLISH_BELIZE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_BOTSWANA", (long) wxLANGUAGE_ENGLISH_BOTSWANA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_CANADA", (long) wxLANGUAGE_ENGLISH_CANADA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_CARIBBEAN", (long) wxLANGUAGE_ENGLISH_CARIBBEAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_DENMARK", (long) wxLANGUAGE_ENGLISH_DENMARK, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_EIRE", (long) wxLANGUAGE_ENGLISH_EIRE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_JAMAICA", (long) wxLANGUAGE_ENGLISH_JAMAICA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_NEW_ZEALAND", (long) wxLANGUAGE_ENGLISH_NEW_ZEALAND, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_PHILIPPINES", (long) wxLANGUAGE_ENGLISH_PHILIPPINES, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_SOUTH_AFRICA", (long) wxLANGUAGE_ENGLISH_SOUTH_AFRICA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_TRINIDAD", (long) wxLANGUAGE_ENGLISH_TRINIDAD, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ENGLISH_ZIMBABWE", (long) wxLANGUAGE_ENGLISH_ZIMBABWE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ESPERANTO", (long) wxLANGUAGE_ESPERANTO, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ESTONIAN", (long) wxLANGUAGE_ESTONIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_FAEROESE", (long) wxLANGUAGE_FAEROESE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_FARSI", (long) wxLANGUAGE_FARSI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_FIJI", (long) wxLANGUAGE_FIJI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_FINNISH", (long) wxLANGUAGE_FINNISH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_FRENCH", (long) wxLANGUAGE_FRENCH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_FRENCH_BELGIAN", (long) wxLANGUAGE_FRENCH_BELGIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_FRENCH_CANADIAN", (long) wxLANGUAGE_FRENCH_CANADIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_FRENCH_LUXEMBOURG", (long) wxLANGUAGE_FRENCH_LUXEMBOURG, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_FRENCH_MONACO", (long) wxLANGUAGE_FRENCH_MONACO, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_FRENCH_SWISS", (long) wxLANGUAGE_FRENCH_SWISS, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_FRISIAN", (long) wxLANGUAGE_FRISIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_GALICIAN", (long) wxLANGUAGE_GALICIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_GEORGIAN", (long) wxLANGUAGE_GEORGIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_GERMAN", (long) wxLANGUAGE_GERMAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_GERMAN_AUSTRIAN", (long) wxLANGUAGE_GERMAN_AUSTRIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_GERMAN_BELGIUM", (long) wxLANGUAGE_GERMAN_BELGIUM, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_GERMAN_LIECHTENSTEIN", (long) wxLANGUAGE_GERMAN_LIECHTENSTEIN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_GERMAN_LUXEMBOURG", (long) wxLANGUAGE_GERMAN_LUXEMBOURG, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_GERMAN_SWISS", (long) wxLANGUAGE_GERMAN_SWISS, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_GREEK", (long) wxLANGUAGE_GREEK, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_GREENLANDIC", (long) wxLANGUAGE_GREENLANDIC, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_GUARANI", (long) wxLANGUAGE_GUARANI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_GUJARATI", (long) wxLANGUAGE_GUJARATI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_HAUSA", (long) wxLANGUAGE_HAUSA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_HEBREW", (long) wxLANGUAGE_HEBREW, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_HINDI", (long) wxLANGUAGE_HINDI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_HUNGARIAN", (long) wxLANGUAGE_HUNGARIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ICELANDIC", (long) wxLANGUAGE_ICELANDIC, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_INDONESIAN", (long) wxLANGUAGE_INDONESIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_INTERLINGUA", (long) wxLANGUAGE_INTERLINGUA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_INTERLINGUE", (long) wxLANGUAGE_INTERLINGUE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_INUKTITUT", (long) wxLANGUAGE_INUKTITUT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_INUPIAK", (long) wxLANGUAGE_INUPIAK, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_IRISH", (long) wxLANGUAGE_IRISH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ITALIAN", (long) wxLANGUAGE_ITALIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ITALIAN_SWISS", (long) wxLANGUAGE_ITALIAN_SWISS, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_JAPANESE", (long) wxLANGUAGE_JAPANESE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_JAVANESE", (long) wxLANGUAGE_JAVANESE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_KANNADA", (long) wxLANGUAGE_KANNADA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_KASHMIRI", (long) wxLANGUAGE_KASHMIRI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_KASHMIRI_INDIA", (long) wxLANGUAGE_KASHMIRI_INDIA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_KAZAKH", (long) wxLANGUAGE_KAZAKH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_KERNEWEK", (long) wxLANGUAGE_KERNEWEK, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_KINYARWANDA", (long) wxLANGUAGE_KINYARWANDA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_KIRGHIZ", (long) wxLANGUAGE_KIRGHIZ, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_KIRUNDI", (long) wxLANGUAGE_KIRUNDI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_KONKANI", (long) wxLANGUAGE_KONKANI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_KOREAN", (long) wxLANGUAGE_KOREAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_KURDISH", (long) wxLANGUAGE_KURDISH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_LAOTHIAN", (long) wxLANGUAGE_LAOTHIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_LATIN", (long) wxLANGUAGE_LATIN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_LATVIAN", (long) wxLANGUAGE_LATVIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_LINGALA", (long) wxLANGUAGE_LINGALA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_LITHUANIAN", (long) wxLANGUAGE_LITHUANIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_MACEDONIAN", (long) wxLANGUAGE_MACEDONIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_MALAGASY", (long) wxLANGUAGE_MALAGASY, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_MALAY", (long) wxLANGUAGE_MALAY, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_MALAYALAM", (long) wxLANGUAGE_MALAYALAM, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_MALAY_BRUNEI_DARUSSALAM", (long) wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_MALAY_MALAYSIA", (long) wxLANGUAGE_MALAY_MALAYSIA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_MALTESE", (long) wxLANGUAGE_MALTESE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_MANIPURI", (long) wxLANGUAGE_MANIPURI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_MAORI", (long) wxLANGUAGE_MAORI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_MARATHI", (long) wxLANGUAGE_MARATHI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_MOLDAVIAN", (long) wxLANGUAGE_MOLDAVIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_MONGOLIAN", (long) wxLANGUAGE_MONGOLIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_NAURU", (long) wxLANGUAGE_NAURU, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_NEPALI", (long) wxLANGUAGE_NEPALI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_NEPALI_INDIA", (long) wxLANGUAGE_NEPALI_INDIA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_NORWEGIAN_BOKMAL", (long) wxLANGUAGE_NORWEGIAN_BOKMAL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_NORWEGIAN_NYNORSK", (long) wxLANGUAGE_NORWEGIAN_NYNORSK, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_OCCITAN", (long) wxLANGUAGE_OCCITAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ORIYA", (long) wxLANGUAGE_ORIYA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_OROMO", (long) wxLANGUAGE_OROMO, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_PASHTO", (long) wxLANGUAGE_PASHTO, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_POLISH", (long) wxLANGUAGE_POLISH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_PORTUGUESE", (long) wxLANGUAGE_PORTUGUESE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_PORTUGUESE_BRAZILIAN", (long) wxLANGUAGE_PORTUGUESE_BRAZILIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_PUNJABI", (long) wxLANGUAGE_PUNJABI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_QUECHUA", (long) wxLANGUAGE_QUECHUA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_RHAETO_ROMANCE", (long) wxLANGUAGE_RHAETO_ROMANCE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ROMANIAN", (long) wxLANGUAGE_ROMANIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_RUSSIAN", (long) wxLANGUAGE_RUSSIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_RUSSIAN_UKRAINE", (long) wxLANGUAGE_RUSSIAN_UKRAINE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SAMOAN", (long) wxLANGUAGE_SAMOAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SANGHO", (long) wxLANGUAGE_SANGHO, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SANSKRIT", (long) wxLANGUAGE_SANSKRIT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SCOTS_GAELIC", (long) wxLANGUAGE_SCOTS_GAELIC, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SERBIAN", (long) wxLANGUAGE_SERBIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SERBIAN_CYRILLIC", (long) wxLANGUAGE_SERBIAN_CYRILLIC, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SERBIAN_LATIN", (long) wxLANGUAGE_SERBIAN_LATIN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SERBO_CROATIAN", (long) wxLANGUAGE_SERBO_CROATIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SESOTHO", (long) wxLANGUAGE_SESOTHO, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SETSWANA", (long) wxLANGUAGE_SETSWANA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SHONA", (long) wxLANGUAGE_SHONA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SINDHI", (long) wxLANGUAGE_SINDHI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SINHALESE", (long) wxLANGUAGE_SINHALESE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SISWATI", (long) wxLANGUAGE_SISWATI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SLOVAK", (long) wxLANGUAGE_SLOVAK, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SLOVENIAN", (long) wxLANGUAGE_SLOVENIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SOMALI", (long) wxLANGUAGE_SOMALI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH", (long) wxLANGUAGE_SPANISH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_ARGENTINA", (long) wxLANGUAGE_SPANISH_ARGENTINA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_BOLIVIA", (long) wxLANGUAGE_SPANISH_BOLIVIA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_CHILE", (long) wxLANGUAGE_SPANISH_CHILE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_COLOMBIA", (long) wxLANGUAGE_SPANISH_COLOMBIA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_COSTA_RICA", (long) wxLANGUAGE_SPANISH_COSTA_RICA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_DOMINICAN_REPUBLIC", (long) wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_ECUADOR", (long) wxLANGUAGE_SPANISH_ECUADOR, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_EL_SALVADOR", (long) wxLANGUAGE_SPANISH_EL_SALVADOR, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_GUATEMALA", (long) wxLANGUAGE_SPANISH_GUATEMALA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_HONDURAS", (long) wxLANGUAGE_SPANISH_HONDURAS, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_MEXICAN", (long) wxLANGUAGE_SPANISH_MEXICAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_MODERN", (long) wxLANGUAGE_SPANISH_MODERN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_NICARAGUA", (long) wxLANGUAGE_SPANISH_NICARAGUA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_PANAMA", (long) wxLANGUAGE_SPANISH_PANAMA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_PARAGUAY", (long) wxLANGUAGE_SPANISH_PARAGUAY, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_PERU", (long) wxLANGUAGE_SPANISH_PERU, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_PUERTO_RICO", (long) wxLANGUAGE_SPANISH_PUERTO_RICO, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_URUGUAY", (long) wxLANGUAGE_SPANISH_URUGUAY, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_US", (long) wxLANGUAGE_SPANISH_US, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SPANISH_VENEZUELA", (long) wxLANGUAGE_SPANISH_VENEZUELA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SUNDANESE", (long) wxLANGUAGE_SUNDANESE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SWAHILI", (long) wxLANGUAGE_SWAHILI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SWEDISH", (long) wxLANGUAGE_SWEDISH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_SWEDISH_FINLAND", (long) wxLANGUAGE_SWEDISH_FINLAND, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_TAGALOG", (long) wxLANGUAGE_TAGALOG, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_TAJIK", (long) wxLANGUAGE_TAJIK, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_TAMIL", (long) wxLANGUAGE_TAMIL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_TATAR", (long) wxLANGUAGE_TATAR, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_TELUGU", (long) wxLANGUAGE_TELUGU, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_THAI", (long) wxLANGUAGE_THAI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_TIBETAN", (long) wxLANGUAGE_TIBETAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_TIGRINYA", (long) wxLANGUAGE_TIGRINYA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_TONGA", (long) wxLANGUAGE_TONGA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_TSONGA", (long) wxLANGUAGE_TSONGA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_TURKISH", (long) wxLANGUAGE_TURKISH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_TURKMEN", (long) wxLANGUAGE_TURKMEN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_TWI", (long) wxLANGUAGE_TWI, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_UIGHUR", (long) wxLANGUAGE_UIGHUR, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_UKRAINIAN", (long) wxLANGUAGE_UKRAINIAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_URDU", (long) wxLANGUAGE_URDU, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_URDU_INDIA", (long) wxLANGUAGE_URDU_INDIA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_URDU_PAKISTAN", (long) wxLANGUAGE_URDU_PAKISTAN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_UZBEK", (long) wxLANGUAGE_UZBEK, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_UZBEK_CYRILLIC", (long) wxLANGUAGE_UZBEK_CYRILLIC, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_UZBEK_LATIN", (long) wxLANGUAGE_UZBEK_LATIN, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_VIETNAMESE", (long) wxLANGUAGE_VIETNAMESE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_VOLAPUK", (long) wxLANGUAGE_VOLAPUK, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_WELSH", (long) wxLANGUAGE_WELSH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_WOLOF", (long) wxLANGUAGE_WOLOF, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_XHOSA", (long) wxLANGUAGE_XHOSA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_YIDDISH", (long) wxLANGUAGE_YIDDISH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_YORUBA", (long) wxLANGUAGE_YORUBA, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ZHUANG", (long) wxLANGUAGE_ZHUANG, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_ZULU", (long) wxLANGUAGE_ZULU, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LANGUAGE_USER_DEFINED", (long) wxLANGUAGE_USER_DEFINED, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LOCALE_CAT_NUMBER", (long) wxLOCALE_CAT_NUMBER, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LOCALE_CAT_DATE", (long) wxLOCALE_CAT_DATE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LOCALE_CAT_MONEY", (long) wxLOCALE_CAT_MONEY, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LOCALE_CAT_MAX", (long) wxLOCALE_CAT_MAX, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LOCALE_THOUSANDS_SEP", (long) wxLOCALE_THOUSANDS_SEP, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LOCALE_DECIMAL_POINT", (long) wxLOCALE_DECIMAL_POINT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LOCALE_LOAD_DEFAULT", (long) wxLOCALE_LOAD_DEFAULT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LOCALE_CONV_ENCODING", (long) wxLOCALE_CONV_ENCODING, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"CONVERT_STRICT", (long) wxCONVERT_STRICT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"CONVERT_SUBSTITUTE", (long) wxCONVERT_SUBSTITUTE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"PLATFORM_CURRENT", (long) wxPLATFORM_CURRENT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"PLATFORM_UNIX", (long) wxPLATFORM_UNIX, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"PLATFORM_WINDOWS", (long) wxPLATFORM_WINDOWS, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"PLATFORM_OS2", (long) wxPLATFORM_OS2, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"PLATFORM_MAC", (long) wxPLATFORM_MAC, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"IMAGELIST_DRAW_NORMAL", (long) wxIMAGELIST_DRAW_NORMAL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"IMAGELIST_DRAW_TRANSPARENT", (long) wxIMAGELIST_DRAW_TRANSPARENT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"IMAGELIST_DRAW_SELECTED", (long) wxIMAGELIST_DRAW_SELECTED, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"IMAGELIST_DRAW_FOCUSED", (long) wxIMAGELIST_DRAW_FOCUSED, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"IMAGE_LIST_NORMAL", (long) wxIMAGE_LIST_NORMAL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"IMAGE_LIST_SMALL", (long) wxIMAGE_LIST_SMALL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"IMAGE_LIST_STATE", (long) wxIMAGE_LIST_STATE, 0, 0, 0},

 {0}};
 
 #ifdef __cplusplus
 {0}};
 
 #ifdef __cplusplus


@@ -17777,9 +19134,388 @@ SWIGEXPORT(void) SWIG_init(void) {
     }
     SWIG_InstallConstants(d,swig_const_table);
     
     }
     SWIG_InstallConstants(d,swig_const_table);
     

+    PyDict_SetItemString(d,"OutRegion", SWIG_FromInt((int)wxOutRegion));
+    PyDict_SetItemString(d,"PartRegion", SWIG_FromInt((int)wxPartRegion));
+    PyDict_SetItemString(d,"InRegion", SWIG_FromInt((int)wxInRegion));
+    PyDict_SetItemString(d,"FONTFAMILY_DEFAULT", SWIG_FromInt((int)wxFONTFAMILY_DEFAULT));
+    PyDict_SetItemString(d,"FONTFAMILY_DECORATIVE", SWIG_FromInt((int)wxFONTFAMILY_DECORATIVE));
+    PyDict_SetItemString(d,"FONTFAMILY_ROMAN", SWIG_FromInt((int)wxFONTFAMILY_ROMAN));
+    PyDict_SetItemString(d,"FONTFAMILY_SCRIPT", SWIG_FromInt((int)wxFONTFAMILY_SCRIPT));
+    PyDict_SetItemString(d,"FONTFAMILY_SWISS", SWIG_FromInt((int)wxFONTFAMILY_SWISS));
+    PyDict_SetItemString(d,"FONTFAMILY_MODERN", SWIG_FromInt((int)wxFONTFAMILY_MODERN));
+    PyDict_SetItemString(d,"FONTFAMILY_TELETYPE", SWIG_FromInt((int)wxFONTFAMILY_TELETYPE));
+    PyDict_SetItemString(d,"FONTFAMILY_MAX", SWIG_FromInt((int)wxFONTFAMILY_MAX));
+    PyDict_SetItemString(d,"FONTFAMILY_UNKNOWN", SWIG_FromInt((int)wxFONTFAMILY_UNKNOWN));
+    PyDict_SetItemString(d,"FONTSTYLE_NORMAL", SWIG_FromInt((int)wxFONTSTYLE_NORMAL));
+    PyDict_SetItemString(d,"FONTSTYLE_ITALIC", SWIG_FromInt((int)wxFONTSTYLE_ITALIC));
+    PyDict_SetItemString(d,"FONTSTYLE_SLANT", SWIG_FromInt((int)wxFONTSTYLE_SLANT));
+    PyDict_SetItemString(d,"FONTSTYLE_MAX", SWIG_FromInt((int)wxFONTSTYLE_MAX));
+    PyDict_SetItemString(d,"FONTWEIGHT_NORMAL", SWIG_FromInt((int)wxFONTWEIGHT_NORMAL));
+    PyDict_SetItemString(d,"FONTWEIGHT_LIGHT", SWIG_FromInt((int)wxFONTWEIGHT_LIGHT));
+    PyDict_SetItemString(d,"FONTWEIGHT_BOLD", SWIG_FromInt((int)wxFONTWEIGHT_BOLD));
+    PyDict_SetItemString(d,"FONTWEIGHT_MAX", SWIG_FromInt((int)wxFONTWEIGHT_MAX));
+    PyDict_SetItemString(d,"FONTFLAG_DEFAULT", SWIG_FromInt((int)wxFONTFLAG_DEFAULT));
+    PyDict_SetItemString(d,"FONTFLAG_ITALIC", SWIG_FromInt((int)wxFONTFLAG_ITALIC));
+    PyDict_SetItemString(d,"FONTFLAG_SLANT", SWIG_FromInt((int)wxFONTFLAG_SLANT));
+    PyDict_SetItemString(d,"FONTFLAG_LIGHT", SWIG_FromInt((int)wxFONTFLAG_LIGHT));
+    PyDict_SetItemString(d,"FONTFLAG_BOLD", SWIG_FromInt((int)wxFONTFLAG_BOLD));
+    PyDict_SetItemString(d,"FONTFLAG_ANTIALIASED", SWIG_FromInt((int)wxFONTFLAG_ANTIALIASED));
+    PyDict_SetItemString(d,"FONTFLAG_NOT_ANTIALIASED", SWIG_FromInt((int)wxFONTFLAG_NOT_ANTIALIASED));
+    PyDict_SetItemString(d,"FONTFLAG_UNDERLINED", SWIG_FromInt((int)wxFONTFLAG_UNDERLINED));
+    PyDict_SetItemString(d,"FONTFLAG_STRIKETHROUGH", SWIG_FromInt((int)wxFONTFLAG_STRIKETHROUGH));
+    PyDict_SetItemString(d,"FONTFLAG_MASK", SWIG_FromInt((int)wxFONTFLAG_MASK));
+    PyDict_SetItemString(d,"FONTENCODING_SYSTEM", SWIG_FromInt((int)wxFONTENCODING_SYSTEM));
+    PyDict_SetItemString(d,"FONTENCODING_DEFAULT", SWIG_FromInt((int)wxFONTENCODING_DEFAULT));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_1", SWIG_FromInt((int)wxFONTENCODING_ISO8859_1));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_2", SWIG_FromInt((int)wxFONTENCODING_ISO8859_2));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_3", SWIG_FromInt((int)wxFONTENCODING_ISO8859_3));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_4", SWIG_FromInt((int)wxFONTENCODING_ISO8859_4));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_5", SWIG_FromInt((int)wxFONTENCODING_ISO8859_5));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_6", SWIG_FromInt((int)wxFONTENCODING_ISO8859_6));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_7", SWIG_FromInt((int)wxFONTENCODING_ISO8859_7));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_8", SWIG_FromInt((int)wxFONTENCODING_ISO8859_8));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_9", SWIG_FromInt((int)wxFONTENCODING_ISO8859_9));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_10", SWIG_FromInt((int)wxFONTENCODING_ISO8859_10));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_11", SWIG_FromInt((int)wxFONTENCODING_ISO8859_11));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_12", SWIG_FromInt((int)wxFONTENCODING_ISO8859_12));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_13", SWIG_FromInt((int)wxFONTENCODING_ISO8859_13));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_14", SWIG_FromInt((int)wxFONTENCODING_ISO8859_14));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_15", SWIG_FromInt((int)wxFONTENCODING_ISO8859_15));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_MAX", SWIG_FromInt((int)wxFONTENCODING_ISO8859_MAX));
+    PyDict_SetItemString(d,"FONTENCODING_KOI8", SWIG_FromInt((int)wxFONTENCODING_KOI8));
+    PyDict_SetItemString(d,"FONTENCODING_ALTERNATIVE", SWIG_FromInt((int)wxFONTENCODING_ALTERNATIVE));
+    PyDict_SetItemString(d,"FONTENCODING_BULGARIAN", SWIG_FromInt((int)wxFONTENCODING_BULGARIAN));
+    PyDict_SetItemString(d,"FONTENCODING_CP437", SWIG_FromInt((int)wxFONTENCODING_CP437));
+    PyDict_SetItemString(d,"FONTENCODING_CP850", SWIG_FromInt((int)wxFONTENCODING_CP850));
+    PyDict_SetItemString(d,"FONTENCODING_CP852", SWIG_FromInt((int)wxFONTENCODING_CP852));
+    PyDict_SetItemString(d,"FONTENCODING_CP855", SWIG_FromInt((int)wxFONTENCODING_CP855));
+    PyDict_SetItemString(d,"FONTENCODING_CP866", SWIG_FromInt((int)wxFONTENCODING_CP866));
+    PyDict_SetItemString(d,"FONTENCODING_CP874", SWIG_FromInt((int)wxFONTENCODING_CP874));
+    PyDict_SetItemString(d,"FONTENCODING_CP932", SWIG_FromInt((int)wxFONTENCODING_CP932));
+    PyDict_SetItemString(d,"FONTENCODING_CP936", SWIG_FromInt((int)wxFONTENCODING_CP936));
+    PyDict_SetItemString(d,"FONTENCODING_CP949", SWIG_FromInt((int)wxFONTENCODING_CP949));
+    PyDict_SetItemString(d,"FONTENCODING_CP950", SWIG_FromInt((int)wxFONTENCODING_CP950));
+    PyDict_SetItemString(d,"FONTENCODING_CP1250", SWIG_FromInt((int)wxFONTENCODING_CP1250));
+    PyDict_SetItemString(d,"FONTENCODING_CP1251", SWIG_FromInt((int)wxFONTENCODING_CP1251));
+    PyDict_SetItemString(d,"FONTENCODING_CP1252", SWIG_FromInt((int)wxFONTENCODING_CP1252));
+    PyDict_SetItemString(d,"FONTENCODING_CP1253", SWIG_FromInt((int)wxFONTENCODING_CP1253));
+    PyDict_SetItemString(d,"FONTENCODING_CP1254", SWIG_FromInt((int)wxFONTENCODING_CP1254));
+    PyDict_SetItemString(d,"FONTENCODING_CP1255", SWIG_FromInt((int)wxFONTENCODING_CP1255));
+    PyDict_SetItemString(d,"FONTENCODING_CP1256", SWIG_FromInt((int)wxFONTENCODING_CP1256));
+    PyDict_SetItemString(d,"FONTENCODING_CP1257", SWIG_FromInt((int)wxFONTENCODING_CP1257));
+    PyDict_SetItemString(d,"FONTENCODING_CP12_MAX", SWIG_FromInt((int)wxFONTENCODING_CP12_MAX));
+    PyDict_SetItemString(d,"FONTENCODING_UTF7", SWIG_FromInt((int)wxFONTENCODING_UTF7));
+    PyDict_SetItemString(d,"FONTENCODING_UTF8", SWIG_FromInt((int)wxFONTENCODING_UTF8));
+    PyDict_SetItemString(d,"FONTENCODING_EUC_JP", SWIG_FromInt((int)wxFONTENCODING_EUC_JP));
+    PyDict_SetItemString(d,"FONTENCODING_UTF16BE", SWIG_FromInt((int)wxFONTENCODING_UTF16BE));
+    PyDict_SetItemString(d,"FONTENCODING_UTF16LE", SWIG_FromInt((int)wxFONTENCODING_UTF16LE));
+    PyDict_SetItemString(d,"FONTENCODING_UTF32BE", SWIG_FromInt((int)wxFONTENCODING_UTF32BE));
+    PyDict_SetItemString(d,"FONTENCODING_UTF32LE", SWIG_FromInt((int)wxFONTENCODING_UTF32LE));
+    PyDict_SetItemString(d,"FONTENCODING_MACROMAN", SWIG_FromInt((int)wxFONTENCODING_MACROMAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACJAPANESE", SWIG_FromInt((int)wxFONTENCODING_MACJAPANESE));
+    PyDict_SetItemString(d,"FONTENCODING_MACCHINESETRAD", SWIG_FromInt((int)wxFONTENCODING_MACCHINESETRAD));
+    PyDict_SetItemString(d,"FONTENCODING_MACKOREAN", SWIG_FromInt((int)wxFONTENCODING_MACKOREAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACARABIC", SWIG_FromInt((int)wxFONTENCODING_MACARABIC));
+    PyDict_SetItemString(d,"FONTENCODING_MACHEBREW", SWIG_FromInt((int)wxFONTENCODING_MACHEBREW));
+    PyDict_SetItemString(d,"FONTENCODING_MACGREEK", SWIG_FromInt((int)wxFONTENCODING_MACGREEK));
+    PyDict_SetItemString(d,"FONTENCODING_MACCYRILLIC", SWIG_FromInt((int)wxFONTENCODING_MACCYRILLIC));
+    PyDict_SetItemString(d,"FONTENCODING_MACDEVANAGARI", SWIG_FromInt((int)wxFONTENCODING_MACDEVANAGARI));
+    PyDict_SetItemString(d,"FONTENCODING_MACGURMUKHI", SWIG_FromInt((int)wxFONTENCODING_MACGURMUKHI));
+    PyDict_SetItemString(d,"FONTENCODING_MACGUJARATI", SWIG_FromInt((int)wxFONTENCODING_MACGUJARATI));
+    PyDict_SetItemString(d,"FONTENCODING_MACORIYA", SWIG_FromInt((int)wxFONTENCODING_MACORIYA));
+    PyDict_SetItemString(d,"FONTENCODING_MACBENGALI", SWIG_FromInt((int)wxFONTENCODING_MACBENGALI));
+    PyDict_SetItemString(d,"FONTENCODING_MACTAMIL", SWIG_FromInt((int)wxFONTENCODING_MACTAMIL));
+    PyDict_SetItemString(d,"FONTENCODING_MACTELUGU", SWIG_FromInt((int)wxFONTENCODING_MACTELUGU));
+    PyDict_SetItemString(d,"FONTENCODING_MACKANNADA", SWIG_FromInt((int)wxFONTENCODING_MACKANNADA));
+    PyDict_SetItemString(d,"FONTENCODING_MACMALAJALAM", SWIG_FromInt((int)wxFONTENCODING_MACMALAJALAM));
+    PyDict_SetItemString(d,"FONTENCODING_MACSINHALESE", SWIG_FromInt((int)wxFONTENCODING_MACSINHALESE));
+    PyDict_SetItemString(d,"FONTENCODING_MACBURMESE", SWIG_FromInt((int)wxFONTENCODING_MACBURMESE));
+    PyDict_SetItemString(d,"FONTENCODING_MACKHMER", SWIG_FromInt((int)wxFONTENCODING_MACKHMER));
+    PyDict_SetItemString(d,"FONTENCODING_MACTHAI", SWIG_FromInt((int)wxFONTENCODING_MACTHAI));
+    PyDict_SetItemString(d,"FONTENCODING_MACLAOTIAN", SWIG_FromInt((int)wxFONTENCODING_MACLAOTIAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACGEORGIAN", SWIG_FromInt((int)wxFONTENCODING_MACGEORGIAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACARMENIAN", SWIG_FromInt((int)wxFONTENCODING_MACARMENIAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACCHINESESIMP", SWIG_FromInt((int)wxFONTENCODING_MACCHINESESIMP));
+    PyDict_SetItemString(d,"FONTENCODING_MACTIBETAN", SWIG_FromInt((int)wxFONTENCODING_MACTIBETAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACMONGOLIAN", SWIG_FromInt((int)wxFONTENCODING_MACMONGOLIAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACETHIOPIC", SWIG_FromInt((int)wxFONTENCODING_MACETHIOPIC));
+    PyDict_SetItemString(d,"FONTENCODING_MACCENTRALEUR", SWIG_FromInt((int)wxFONTENCODING_MACCENTRALEUR));
+    PyDict_SetItemString(d,"FONTENCODING_MACVIATNAMESE", SWIG_FromInt((int)wxFONTENCODING_MACVIATNAMESE));
+    PyDict_SetItemString(d,"FONTENCODING_MACARABICEXT", SWIG_FromInt((int)wxFONTENCODING_MACARABICEXT));
+    PyDict_SetItemString(d,"FONTENCODING_MACSYMBOL", SWIG_FromInt((int)wxFONTENCODING_MACSYMBOL));
+    PyDict_SetItemString(d,"FONTENCODING_MACDINGBATS", SWIG_FromInt((int)wxFONTENCODING_MACDINGBATS));
+    PyDict_SetItemString(d,"FONTENCODING_MACTURKISH", SWIG_FromInt((int)wxFONTENCODING_MACTURKISH));
+    PyDict_SetItemString(d,"FONTENCODING_MACCROATIAN", SWIG_FromInt((int)wxFONTENCODING_MACCROATIAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACICELANDIC", SWIG_FromInt((int)wxFONTENCODING_MACICELANDIC));
+    PyDict_SetItemString(d,"FONTENCODING_MACROMANIAN", SWIG_FromInt((int)wxFONTENCODING_MACROMANIAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACCELTIC", SWIG_FromInt((int)wxFONTENCODING_MACCELTIC));
+    PyDict_SetItemString(d,"FONTENCODING_MACGAELIC", SWIG_FromInt((int)wxFONTENCODING_MACGAELIC));
+    PyDict_SetItemString(d,"FONTENCODING_MACKEYBOARD", SWIG_FromInt((int)wxFONTENCODING_MACKEYBOARD));
+    PyDict_SetItemString(d,"FONTENCODING_MACMIN", SWIG_FromInt((int)wxFONTENCODING_MACMIN));
+    PyDict_SetItemString(d,"FONTENCODING_MACMAX", SWIG_FromInt((int)wxFONTENCODING_MACMAX));
+    PyDict_SetItemString(d,"FONTENCODING_MAX", SWIG_FromInt((int)wxFONTENCODING_MAX));
+    PyDict_SetItemString(d,"FONTENCODING_UTF16", SWIG_FromInt((int)wxFONTENCODING_UTF16));
+    PyDict_SetItemString(d,"FONTENCODING_UTF32", SWIG_FromInt((int)wxFONTENCODING_UTF32));
+    PyDict_SetItemString(d,"FONTENCODING_UNICODE", SWIG_FromInt((int)wxFONTENCODING_UNICODE));
+    PyDict_SetItemString(d,"FONTENCODING_GB2312", SWIG_FromInt((int)wxFONTENCODING_GB2312));
+    PyDict_SetItemString(d,"FONTENCODING_BIG5", SWIG_FromInt((int)wxFONTENCODING_BIG5));
+    PyDict_SetItemString(d,"FONTENCODING_SHIFT_JIS", SWIG_FromInt((int)wxFONTENCODING_SHIFT_JIS));

     
     wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator");
     
     
     wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator");
     

+    PyDict_SetItemString(d,"LANGUAGE_DEFAULT", SWIG_FromInt((int)wxLANGUAGE_DEFAULT));
+    PyDict_SetItemString(d,"LANGUAGE_UNKNOWN", SWIG_FromInt((int)wxLANGUAGE_UNKNOWN));
+    PyDict_SetItemString(d,"LANGUAGE_ABKHAZIAN", SWIG_FromInt((int)wxLANGUAGE_ABKHAZIAN));
+    PyDict_SetItemString(d,"LANGUAGE_AFAR", SWIG_FromInt((int)wxLANGUAGE_AFAR));
+    PyDict_SetItemString(d,"LANGUAGE_AFRIKAANS", SWIG_FromInt((int)wxLANGUAGE_AFRIKAANS));
+    PyDict_SetItemString(d,"LANGUAGE_ALBANIAN", SWIG_FromInt((int)wxLANGUAGE_ALBANIAN));
+    PyDict_SetItemString(d,"LANGUAGE_AMHARIC", SWIG_FromInt((int)wxLANGUAGE_AMHARIC));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC", SWIG_FromInt((int)wxLANGUAGE_ARABIC));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_ALGERIA", SWIG_FromInt((int)wxLANGUAGE_ARABIC_ALGERIA));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_BAHRAIN", SWIG_FromInt((int)wxLANGUAGE_ARABIC_BAHRAIN));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_EGYPT", SWIG_FromInt((int)wxLANGUAGE_ARABIC_EGYPT));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_IRAQ", SWIG_FromInt((int)wxLANGUAGE_ARABIC_IRAQ));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_JORDAN", SWIG_FromInt((int)wxLANGUAGE_ARABIC_JORDAN));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_KUWAIT", SWIG_FromInt((int)wxLANGUAGE_ARABIC_KUWAIT));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_LEBANON", SWIG_FromInt((int)wxLANGUAGE_ARABIC_LEBANON));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_LIBYA", SWIG_FromInt((int)wxLANGUAGE_ARABIC_LIBYA));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_MOROCCO", SWIG_FromInt((int)wxLANGUAGE_ARABIC_MOROCCO));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_OMAN", SWIG_FromInt((int)wxLANGUAGE_ARABIC_OMAN));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_QATAR", SWIG_FromInt((int)wxLANGUAGE_ARABIC_QATAR));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_SAUDI_ARABIA", SWIG_FromInt((int)wxLANGUAGE_ARABIC_SAUDI_ARABIA));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_SUDAN", SWIG_FromInt((int)wxLANGUAGE_ARABIC_SUDAN));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_SYRIA", SWIG_FromInt((int)wxLANGUAGE_ARABIC_SYRIA));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_TUNISIA", SWIG_FromInt((int)wxLANGUAGE_ARABIC_TUNISIA));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_UAE", SWIG_FromInt((int)wxLANGUAGE_ARABIC_UAE));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_YEMEN", SWIG_FromInt((int)wxLANGUAGE_ARABIC_YEMEN));
+    PyDict_SetItemString(d,"LANGUAGE_ARMENIAN", SWIG_FromInt((int)wxLANGUAGE_ARMENIAN));
+    PyDict_SetItemString(d,"LANGUAGE_ASSAMESE", SWIG_FromInt((int)wxLANGUAGE_ASSAMESE));
+    PyDict_SetItemString(d,"LANGUAGE_AYMARA", SWIG_FromInt((int)wxLANGUAGE_AYMARA));
+    PyDict_SetItemString(d,"LANGUAGE_AZERI", SWIG_FromInt((int)wxLANGUAGE_AZERI));
+    PyDict_SetItemString(d,"LANGUAGE_AZERI_CYRILLIC", SWIG_FromInt((int)wxLANGUAGE_AZERI_CYRILLIC));
+    PyDict_SetItemString(d,"LANGUAGE_AZERI_LATIN", SWIG_FromInt((int)wxLANGUAGE_AZERI_LATIN));
+    PyDict_SetItemString(d,"LANGUAGE_BASHKIR", SWIG_FromInt((int)wxLANGUAGE_BASHKIR));
+    PyDict_SetItemString(d,"LANGUAGE_BASQUE", SWIG_FromInt((int)wxLANGUAGE_BASQUE));
+    PyDict_SetItemString(d,"LANGUAGE_BELARUSIAN", SWIG_FromInt((int)wxLANGUAGE_BELARUSIAN));
+    PyDict_SetItemString(d,"LANGUAGE_BENGALI", SWIG_FromInt((int)wxLANGUAGE_BENGALI));
+    PyDict_SetItemString(d,"LANGUAGE_BHUTANI", SWIG_FromInt((int)wxLANGUAGE_BHUTANI));
+    PyDict_SetItemString(d,"LANGUAGE_BIHARI", SWIG_FromInt((int)wxLANGUAGE_BIHARI));
+    PyDict_SetItemString(d,"LANGUAGE_BISLAMA", SWIG_FromInt((int)wxLANGUAGE_BISLAMA));
+    PyDict_SetItemString(d,"LANGUAGE_BRETON", SWIG_FromInt((int)wxLANGUAGE_BRETON));
+    PyDict_SetItemString(d,"LANGUAGE_BULGARIAN", SWIG_FromInt((int)wxLANGUAGE_BULGARIAN));
+    PyDict_SetItemString(d,"LANGUAGE_BURMESE", SWIG_FromInt((int)wxLANGUAGE_BURMESE));
+    PyDict_SetItemString(d,"LANGUAGE_CAMBODIAN", SWIG_FromInt((int)wxLANGUAGE_CAMBODIAN));
+    PyDict_SetItemString(d,"LANGUAGE_CATALAN", SWIG_FromInt((int)wxLANGUAGE_CATALAN));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE", SWIG_FromInt((int)wxLANGUAGE_CHINESE));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE_SIMPLIFIED", SWIG_FromInt((int)wxLANGUAGE_CHINESE_SIMPLIFIED));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE_TRADITIONAL", SWIG_FromInt((int)wxLANGUAGE_CHINESE_TRADITIONAL));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE_HONGKONG", SWIG_FromInt((int)wxLANGUAGE_CHINESE_HONGKONG));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE_MACAU", SWIG_FromInt((int)wxLANGUAGE_CHINESE_MACAU));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE_SINGAPORE", SWIG_FromInt((int)wxLANGUAGE_CHINESE_SINGAPORE));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE_TAIWAN", SWIG_FromInt((int)wxLANGUAGE_CHINESE_TAIWAN));
+    PyDict_SetItemString(d,"LANGUAGE_CORSICAN", SWIG_FromInt((int)wxLANGUAGE_CORSICAN));
+    PyDict_SetItemString(d,"LANGUAGE_CROATIAN", SWIG_FromInt((int)wxLANGUAGE_CROATIAN));
+    PyDict_SetItemString(d,"LANGUAGE_CZECH", SWIG_FromInt((int)wxLANGUAGE_CZECH));
+    PyDict_SetItemString(d,"LANGUAGE_DANISH", SWIG_FromInt((int)wxLANGUAGE_DANISH));
+    PyDict_SetItemString(d,"LANGUAGE_DUTCH", SWIG_FromInt((int)wxLANGUAGE_DUTCH));
+    PyDict_SetItemString(d,"LANGUAGE_DUTCH_BELGIAN", SWIG_FromInt((int)wxLANGUAGE_DUTCH_BELGIAN));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH", SWIG_FromInt((int)wxLANGUAGE_ENGLISH));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_UK", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_UK));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_US", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_US));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_AUSTRALIA", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_AUSTRALIA));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_BELIZE", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_BELIZE));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_BOTSWANA", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_BOTSWANA));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_CANADA", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_CANADA));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_CARIBBEAN", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_CARIBBEAN));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_DENMARK", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_DENMARK));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_EIRE", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_EIRE));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_JAMAICA", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_JAMAICA));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_NEW_ZEALAND", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_NEW_ZEALAND));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_PHILIPPINES", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_PHILIPPINES));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_SOUTH_AFRICA", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_SOUTH_AFRICA));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_TRINIDAD", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_TRINIDAD));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_ZIMBABWE", SWIG_FromInt((int)wxLANGUAGE_ENGLISH_ZIMBABWE));
+    PyDict_SetItemString(d,"LANGUAGE_ESPERANTO", SWIG_FromInt((int)wxLANGUAGE_ESPERANTO));
+    PyDict_SetItemString(d,"LANGUAGE_ESTONIAN", SWIG_FromInt((int)wxLANGUAGE_ESTONIAN));
+    PyDict_SetItemString(d,"LANGUAGE_FAEROESE", SWIG_FromInt((int)wxLANGUAGE_FAEROESE));
+    PyDict_SetItemString(d,"LANGUAGE_FARSI", SWIG_FromInt((int)wxLANGUAGE_FARSI));
+    PyDict_SetItemString(d,"LANGUAGE_FIJI", SWIG_FromInt((int)wxLANGUAGE_FIJI));
+    PyDict_SetItemString(d,"LANGUAGE_FINNISH", SWIG_FromInt((int)wxLANGUAGE_FINNISH));
+    PyDict_SetItemString(d,"LANGUAGE_FRENCH", SWIG_FromInt((int)wxLANGUAGE_FRENCH));
+    PyDict_SetItemString(d,"LANGUAGE_FRENCH_BELGIAN", SWIG_FromInt((int)wxLANGUAGE_FRENCH_BELGIAN));
+    PyDict_SetItemString(d,"LANGUAGE_FRENCH_CANADIAN", SWIG_FromInt((int)wxLANGUAGE_FRENCH_CANADIAN));
+    PyDict_SetItemString(d,"LANGUAGE_FRENCH_LUXEMBOURG", SWIG_FromInt((int)wxLANGUAGE_FRENCH_LUXEMBOURG));
+    PyDict_SetItemString(d,"LANGUAGE_FRENCH_MONACO", SWIG_FromInt((int)wxLANGUAGE_FRENCH_MONACO));
+    PyDict_SetItemString(d,"LANGUAGE_FRENCH_SWISS", SWIG_FromInt((int)wxLANGUAGE_FRENCH_SWISS));
+    PyDict_SetItemString(d,"LANGUAGE_FRISIAN", SWIG_FromInt((int)wxLANGUAGE_FRISIAN));
+    PyDict_SetItemString(d,"LANGUAGE_GALICIAN", SWIG_FromInt((int)wxLANGUAGE_GALICIAN));
+    PyDict_SetItemString(d,"LANGUAGE_GEORGIAN", SWIG_FromInt((int)wxLANGUAGE_GEORGIAN));
+    PyDict_SetItemString(d,"LANGUAGE_GERMAN", SWIG_FromInt((int)wxLANGUAGE_GERMAN));
+    PyDict_SetItemString(d,"LANGUAGE_GERMAN_AUSTRIAN", SWIG_FromInt((int)wxLANGUAGE_GERMAN_AUSTRIAN));
+    PyDict_SetItemString(d,"LANGUAGE_GERMAN_BELGIUM", SWIG_FromInt((int)wxLANGUAGE_GERMAN_BELGIUM));
+    PyDict_SetItemString(d,"LANGUAGE_GERMAN_LIECHTENSTEIN", SWIG_FromInt((int)wxLANGUAGE_GERMAN_LIECHTENSTEIN));
+    PyDict_SetItemString(d,"LANGUAGE_GERMAN_LUXEMBOURG", SWIG_FromInt((int)wxLANGUAGE_GERMAN_LUXEMBOURG));
+    PyDict_SetItemString(d,"LANGUAGE_GERMAN_SWISS", SWIG_FromInt((int)wxLANGUAGE_GERMAN_SWISS));
+    PyDict_SetItemString(d,"LANGUAGE_GREEK", SWIG_FromInt((int)wxLANGUAGE_GREEK));
+    PyDict_SetItemString(d,"LANGUAGE_GREENLANDIC", SWIG_FromInt((int)wxLANGUAGE_GREENLANDIC));
+    PyDict_SetItemString(d,"LANGUAGE_GUARANI", SWIG_FromInt((int)wxLANGUAGE_GUARANI));
+    PyDict_SetItemString(d,"LANGUAGE_GUJARATI", SWIG_FromInt((int)wxLANGUAGE_GUJARATI));
+    PyDict_SetItemString(d,"LANGUAGE_HAUSA", SWIG_FromInt((int)wxLANGUAGE_HAUSA));
+    PyDict_SetItemString(d,"LANGUAGE_HEBREW", SWIG_FromInt((int)wxLANGUAGE_HEBREW));
+    PyDict_SetItemString(d,"LANGUAGE_HINDI", SWIG_FromInt((int)wxLANGUAGE_HINDI));
+    PyDict_SetItemString(d,"LANGUAGE_HUNGARIAN", SWIG_FromInt((int)wxLANGUAGE_HUNGARIAN));
+    PyDict_SetItemString(d,"LANGUAGE_ICELANDIC", SWIG_FromInt((int)wxLANGUAGE_ICELANDIC));
+    PyDict_SetItemString(d,"LANGUAGE_INDONESIAN", SWIG_FromInt((int)wxLANGUAGE_INDONESIAN));
+    PyDict_SetItemString(d,"LANGUAGE_INTERLINGUA", SWIG_FromInt((int)wxLANGUAGE_INTERLINGUA));
+    PyDict_SetItemString(d,"LANGUAGE_INTERLINGUE", SWIG_FromInt((int)wxLANGUAGE_INTERLINGUE));
+    PyDict_SetItemString(d,"LANGUAGE_INUKTITUT", SWIG_FromInt((int)wxLANGUAGE_INUKTITUT));
+    PyDict_SetItemString(d,"LANGUAGE_INUPIAK", SWIG_FromInt((int)wxLANGUAGE_INUPIAK));
+    PyDict_SetItemString(d,"LANGUAGE_IRISH", SWIG_FromInt((int)wxLANGUAGE_IRISH));
+    PyDict_SetItemString(d,"LANGUAGE_ITALIAN", SWIG_FromInt((int)wxLANGUAGE_ITALIAN));
+    PyDict_SetItemString(d,"LANGUAGE_ITALIAN_SWISS", SWIG_FromInt((int)wxLANGUAGE_ITALIAN_SWISS));
+    PyDict_SetItemString(d,"LANGUAGE_JAPANESE", SWIG_FromInt((int)wxLANGUAGE_JAPANESE));
+    PyDict_SetItemString(d,"LANGUAGE_JAVANESE", SWIG_FromInt((int)wxLANGUAGE_JAVANESE));
+    PyDict_SetItemString(d,"LANGUAGE_KANNADA", SWIG_FromInt((int)wxLANGUAGE_KANNADA));
+    PyDict_SetItemString(d,"LANGUAGE_KASHMIRI", SWIG_FromInt((int)wxLANGUAGE_KASHMIRI));
+    PyDict_SetItemString(d,"LANGUAGE_KASHMIRI_INDIA", SWIG_FromInt((int)wxLANGUAGE_KASHMIRI_INDIA));
+    PyDict_SetItemString(d,"LANGUAGE_KAZAKH", SWIG_FromInt((int)wxLANGUAGE_KAZAKH));
+    PyDict_SetItemString(d,"LANGUAGE_KERNEWEK", SWIG_FromInt((int)wxLANGUAGE_KERNEWEK));
+    PyDict_SetItemString(d,"LANGUAGE_KINYARWANDA", SWIG_FromInt((int)wxLANGUAGE_KINYARWANDA));
+    PyDict_SetItemString(d,"LANGUAGE_KIRGHIZ", SWIG_FromInt((int)wxLANGUAGE_KIRGHIZ));
+    PyDict_SetItemString(d,"LANGUAGE_KIRUNDI", SWIG_FromInt((int)wxLANGUAGE_KIRUNDI));
+    PyDict_SetItemString(d,"LANGUAGE_KONKANI", SWIG_FromInt((int)wxLANGUAGE_KONKANI));
+    PyDict_SetItemString(d,"LANGUAGE_KOREAN", SWIG_FromInt((int)wxLANGUAGE_KOREAN));
+    PyDict_SetItemString(d,"LANGUAGE_KURDISH", SWIG_FromInt((int)wxLANGUAGE_KURDISH));
+    PyDict_SetItemString(d,"LANGUAGE_LAOTHIAN", SWIG_FromInt((int)wxLANGUAGE_LAOTHIAN));
+    PyDict_SetItemString(d,"LANGUAGE_LATIN", SWIG_FromInt((int)wxLANGUAGE_LATIN));
+    PyDict_SetItemString(d,"LANGUAGE_LATVIAN", SWIG_FromInt((int)wxLANGUAGE_LATVIAN));
+    PyDict_SetItemString(d,"LANGUAGE_LINGALA", SWIG_FromInt((int)wxLANGUAGE_LINGALA));
+    PyDict_SetItemString(d,"LANGUAGE_LITHUANIAN", SWIG_FromInt((int)wxLANGUAGE_LITHUANIAN));
+    PyDict_SetItemString(d,"LANGUAGE_MACEDONIAN", SWIG_FromInt((int)wxLANGUAGE_MACEDONIAN));
+    PyDict_SetItemString(d,"LANGUAGE_MALAGASY", SWIG_FromInt((int)wxLANGUAGE_MALAGASY));
+    PyDict_SetItemString(d,"LANGUAGE_MALAY", SWIG_FromInt((int)wxLANGUAGE_MALAY));
+    PyDict_SetItemString(d,"LANGUAGE_MALAYALAM", SWIG_FromInt((int)wxLANGUAGE_MALAYALAM));
+    PyDict_SetItemString(d,"LANGUAGE_MALAY_BRUNEI_DARUSSALAM", SWIG_FromInt((int)wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM));
+    PyDict_SetItemString(d,"LANGUAGE_MALAY_MALAYSIA", SWIG_FromInt((int)wxLANGUAGE_MALAY_MALAYSIA));
+    PyDict_SetItemString(d,"LANGUAGE_MALTESE", SWIG_FromInt((int)wxLANGUAGE_MALTESE));
+    PyDict_SetItemString(d,"LANGUAGE_MANIPURI", SWIG_FromInt((int)wxLANGUAGE_MANIPURI));
+    PyDict_SetItemString(d,"LANGUAGE_MAORI", SWIG_FromInt((int)wxLANGUAGE_MAORI));
+    PyDict_SetItemString(d,"LANGUAGE_MARATHI", SWIG_FromInt((int)wxLANGUAGE_MARATHI));
+    PyDict_SetItemString(d,"LANGUAGE_MOLDAVIAN", SWIG_FromInt((int)wxLANGUAGE_MOLDAVIAN));
+    PyDict_SetItemString(d,"LANGUAGE_MONGOLIAN", SWIG_FromInt((int)wxLANGUAGE_MONGOLIAN));
+    PyDict_SetItemString(d,"LANGUAGE_NAURU", SWIG_FromInt((int)wxLANGUAGE_NAURU));
+    PyDict_SetItemString(d,"LANGUAGE_NEPALI", SWIG_FromInt((int)wxLANGUAGE_NEPALI));
+    PyDict_SetItemString(d,"LANGUAGE_NEPALI_INDIA", SWIG_FromInt((int)wxLANGUAGE_NEPALI_INDIA));
+    PyDict_SetItemString(d,"LANGUAGE_NORWEGIAN_BOKMAL", SWIG_FromInt((int)wxLANGUAGE_NORWEGIAN_BOKMAL));
+    PyDict_SetItemString(d,"LANGUAGE_NORWEGIAN_NYNORSK", SWIG_FromInt((int)wxLANGUAGE_NORWEGIAN_NYNORSK));
+    PyDict_SetItemString(d,"LANGUAGE_OCCITAN", SWIG_FromInt((int)wxLANGUAGE_OCCITAN));
+    PyDict_SetItemString(d,"LANGUAGE_ORIYA", SWIG_FromInt((int)wxLANGUAGE_ORIYA));
+    PyDict_SetItemString(d,"LANGUAGE_OROMO", SWIG_FromInt((int)wxLANGUAGE_OROMO));
+    PyDict_SetItemString(d,"LANGUAGE_PASHTO", SWIG_FromInt((int)wxLANGUAGE_PASHTO));
+    PyDict_SetItemString(d,"LANGUAGE_POLISH", SWIG_FromInt((int)wxLANGUAGE_POLISH));
+    PyDict_SetItemString(d,"LANGUAGE_PORTUGUESE", SWIG_FromInt((int)wxLANGUAGE_PORTUGUESE));
+    PyDict_SetItemString(d,"LANGUAGE_PORTUGUESE_BRAZILIAN", SWIG_FromInt((int)wxLANGUAGE_PORTUGUESE_BRAZILIAN));
+    PyDict_SetItemString(d,"LANGUAGE_PUNJABI", SWIG_FromInt((int)wxLANGUAGE_PUNJABI));
+    PyDict_SetItemString(d,"LANGUAGE_QUECHUA", SWIG_FromInt((int)wxLANGUAGE_QUECHUA));
+    PyDict_SetItemString(d,"LANGUAGE_RHAETO_ROMANCE", SWIG_FromInt((int)wxLANGUAGE_RHAETO_ROMANCE));
+    PyDict_SetItemString(d,"LANGUAGE_ROMANIAN", SWIG_FromInt((int)wxLANGUAGE_ROMANIAN));
+    PyDict_SetItemString(d,"LANGUAGE_RUSSIAN", SWIG_FromInt((int)wxLANGUAGE_RUSSIAN));
+    PyDict_SetItemString(d,"LANGUAGE_RUSSIAN_UKRAINE", SWIG_FromInt((int)wxLANGUAGE_RUSSIAN_UKRAINE));
+    PyDict_SetItemString(d,"LANGUAGE_SAMOAN", SWIG_FromInt((int)wxLANGUAGE_SAMOAN));
+    PyDict_SetItemString(d,"LANGUAGE_SANGHO", SWIG_FromInt((int)wxLANGUAGE_SANGHO));
+    PyDict_SetItemString(d,"LANGUAGE_SANSKRIT", SWIG_FromInt((int)wxLANGUAGE_SANSKRIT));
+    PyDict_SetItemString(d,"LANGUAGE_SCOTS_GAELIC", SWIG_FromInt((int)wxLANGUAGE_SCOTS_GAELIC));
+    PyDict_SetItemString(d,"LANGUAGE_SERBIAN", SWIG_FromInt((int)wxLANGUAGE_SERBIAN));
+    PyDict_SetItemString(d,"LANGUAGE_SERBIAN_CYRILLIC", SWIG_FromInt((int)wxLANGUAGE_SERBIAN_CYRILLIC));
+    PyDict_SetItemString(d,"LANGUAGE_SERBIAN_LATIN", SWIG_FromInt((int)wxLANGUAGE_SERBIAN_LATIN));
+    PyDict_SetItemString(d,"LANGUAGE_SERBO_CROATIAN", SWIG_FromInt((int)wxLANGUAGE_SERBO_CROATIAN));
+    PyDict_SetItemString(d,"LANGUAGE_SESOTHO", SWIG_FromInt((int)wxLANGUAGE_SESOTHO));
+    PyDict_SetItemString(d,"LANGUAGE_SETSWANA", SWIG_FromInt((int)wxLANGUAGE_SETSWANA));
+    PyDict_SetItemString(d,"LANGUAGE_SHONA", SWIG_FromInt((int)wxLANGUAGE_SHONA));
+    PyDict_SetItemString(d,"LANGUAGE_SINDHI", SWIG_FromInt((int)wxLANGUAGE_SINDHI));
+    PyDict_SetItemString(d,"LANGUAGE_SINHALESE", SWIG_FromInt((int)wxLANGUAGE_SINHALESE));
+    PyDict_SetItemString(d,"LANGUAGE_SISWATI", SWIG_FromInt((int)wxLANGUAGE_SISWATI));
+    PyDict_SetItemString(d,"LANGUAGE_SLOVAK", SWIG_FromInt((int)wxLANGUAGE_SLOVAK));
+    PyDict_SetItemString(d,"LANGUAGE_SLOVENIAN", SWIG_FromInt((int)wxLANGUAGE_SLOVENIAN));
+    PyDict_SetItemString(d,"LANGUAGE_SOMALI", SWIG_FromInt((int)wxLANGUAGE_SOMALI));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH", SWIG_FromInt((int)wxLANGUAGE_SPANISH));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_ARGENTINA", SWIG_FromInt((int)wxLANGUAGE_SPANISH_ARGENTINA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_BOLIVIA", SWIG_FromInt((int)wxLANGUAGE_SPANISH_BOLIVIA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_CHILE", SWIG_FromInt((int)wxLANGUAGE_SPANISH_CHILE));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_COLOMBIA", SWIG_FromInt((int)wxLANGUAGE_SPANISH_COLOMBIA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_COSTA_RICA", SWIG_FromInt((int)wxLANGUAGE_SPANISH_COSTA_RICA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_DOMINICAN_REPUBLIC", SWIG_FromInt((int)wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_ECUADOR", SWIG_FromInt((int)wxLANGUAGE_SPANISH_ECUADOR));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_EL_SALVADOR", SWIG_FromInt((int)wxLANGUAGE_SPANISH_EL_SALVADOR));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_GUATEMALA", SWIG_FromInt((int)wxLANGUAGE_SPANISH_GUATEMALA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_HONDURAS", SWIG_FromInt((int)wxLANGUAGE_SPANISH_HONDURAS));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_MEXICAN", SWIG_FromInt((int)wxLANGUAGE_SPANISH_MEXICAN));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_MODERN", SWIG_FromInt((int)wxLANGUAGE_SPANISH_MODERN));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_NICARAGUA", SWIG_FromInt((int)wxLANGUAGE_SPANISH_NICARAGUA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_PANAMA", SWIG_FromInt((int)wxLANGUAGE_SPANISH_PANAMA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_PARAGUAY", SWIG_FromInt((int)wxLANGUAGE_SPANISH_PARAGUAY));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_PERU", SWIG_FromInt((int)wxLANGUAGE_SPANISH_PERU));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_PUERTO_RICO", SWIG_FromInt((int)wxLANGUAGE_SPANISH_PUERTO_RICO));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_URUGUAY", SWIG_FromInt((int)wxLANGUAGE_SPANISH_URUGUAY));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_US", SWIG_FromInt((int)wxLANGUAGE_SPANISH_US));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_VENEZUELA", SWIG_FromInt((int)wxLANGUAGE_SPANISH_VENEZUELA));
+    PyDict_SetItemString(d,"LANGUAGE_SUNDANESE", SWIG_FromInt((int)wxLANGUAGE_SUNDANESE));
+    PyDict_SetItemString(d,"LANGUAGE_SWAHILI", SWIG_FromInt((int)wxLANGUAGE_SWAHILI));
+    PyDict_SetItemString(d,"LANGUAGE_SWEDISH", SWIG_FromInt((int)wxLANGUAGE_SWEDISH));
+    PyDict_SetItemString(d,"LANGUAGE_SWEDISH_FINLAND", SWIG_FromInt((int)wxLANGUAGE_SWEDISH_FINLAND));
+    PyDict_SetItemString(d,"LANGUAGE_TAGALOG", SWIG_FromInt((int)wxLANGUAGE_TAGALOG));
+    PyDict_SetItemString(d,"LANGUAGE_TAJIK", SWIG_FromInt((int)wxLANGUAGE_TAJIK));
+    PyDict_SetItemString(d,"LANGUAGE_TAMIL", SWIG_FromInt((int)wxLANGUAGE_TAMIL));
+    PyDict_SetItemString(d,"LANGUAGE_TATAR", SWIG_FromInt((int)wxLANGUAGE_TATAR));
+    PyDict_SetItemString(d,"LANGUAGE_TELUGU", SWIG_FromInt((int)wxLANGUAGE_TELUGU));
+    PyDict_SetItemString(d,"LANGUAGE_THAI", SWIG_FromInt((int)wxLANGUAGE_THAI));
+    PyDict_SetItemString(d,"LANGUAGE_TIBETAN", SWIG_FromInt((int)wxLANGUAGE_TIBETAN));
+    PyDict_SetItemString(d,"LANGUAGE_TIGRINYA", SWIG_FromInt((int)wxLANGUAGE_TIGRINYA));
+    PyDict_SetItemString(d,"LANGUAGE_TONGA", SWIG_FromInt((int)wxLANGUAGE_TONGA));
+    PyDict_SetItemString(d,"LANGUAGE_TSONGA", SWIG_FromInt((int)wxLANGUAGE_TSONGA));
+    PyDict_SetItemString(d,"LANGUAGE_TURKISH", SWIG_FromInt((int)wxLANGUAGE_TURKISH));
+    PyDict_SetItemString(d,"LANGUAGE_TURKMEN", SWIG_FromInt((int)wxLANGUAGE_TURKMEN));
+    PyDict_SetItemString(d,"LANGUAGE_TWI", SWIG_FromInt((int)wxLANGUAGE_TWI));
+    PyDict_SetItemString(d,"LANGUAGE_UIGHUR", SWIG_FromInt((int)wxLANGUAGE_UIGHUR));
+    PyDict_SetItemString(d,"LANGUAGE_UKRAINIAN", SWIG_FromInt((int)wxLANGUAGE_UKRAINIAN));
+    PyDict_SetItemString(d,"LANGUAGE_URDU", SWIG_FromInt((int)wxLANGUAGE_URDU));
+    PyDict_SetItemString(d,"LANGUAGE_URDU_INDIA", SWIG_FromInt((int)wxLANGUAGE_URDU_INDIA));
+    PyDict_SetItemString(d,"LANGUAGE_URDU_PAKISTAN", SWIG_FromInt((int)wxLANGUAGE_URDU_PAKISTAN));
+    PyDict_SetItemString(d,"LANGUAGE_UZBEK", SWIG_FromInt((int)wxLANGUAGE_UZBEK));
+    PyDict_SetItemString(d,"LANGUAGE_UZBEK_CYRILLIC", SWIG_FromInt((int)wxLANGUAGE_UZBEK_CYRILLIC));
+    PyDict_SetItemString(d,"LANGUAGE_UZBEK_LATIN", SWIG_FromInt((int)wxLANGUAGE_UZBEK_LATIN));
+    PyDict_SetItemString(d,"LANGUAGE_VIETNAMESE", SWIG_FromInt((int)wxLANGUAGE_VIETNAMESE));
+    PyDict_SetItemString(d,"LANGUAGE_VOLAPUK", SWIG_FromInt((int)wxLANGUAGE_VOLAPUK));
+    PyDict_SetItemString(d,"LANGUAGE_WELSH", SWIG_FromInt((int)wxLANGUAGE_WELSH));
+    PyDict_SetItemString(d,"LANGUAGE_WOLOF", SWIG_FromInt((int)wxLANGUAGE_WOLOF));
+    PyDict_SetItemString(d,"LANGUAGE_XHOSA", SWIG_FromInt((int)wxLANGUAGE_XHOSA));
+    PyDict_SetItemString(d,"LANGUAGE_YIDDISH", SWIG_FromInt((int)wxLANGUAGE_YIDDISH));
+    PyDict_SetItemString(d,"LANGUAGE_YORUBA", SWIG_FromInt((int)wxLANGUAGE_YORUBA));
+    PyDict_SetItemString(d,"LANGUAGE_ZHUANG", SWIG_FromInt((int)wxLANGUAGE_ZHUANG));
+    PyDict_SetItemString(d,"LANGUAGE_ZULU", SWIG_FromInt((int)wxLANGUAGE_ZULU));
+    PyDict_SetItemString(d,"LANGUAGE_USER_DEFINED", SWIG_FromInt((int)wxLANGUAGE_USER_DEFINED));
+    PyDict_SetItemString(d,"LOCALE_CAT_NUMBER", SWIG_FromInt((int)wxLOCALE_CAT_NUMBER));
+    PyDict_SetItemString(d,"LOCALE_CAT_DATE", SWIG_FromInt((int)wxLOCALE_CAT_DATE));
+    PyDict_SetItemString(d,"LOCALE_CAT_MONEY", SWIG_FromInt((int)wxLOCALE_CAT_MONEY));
+    PyDict_SetItemString(d,"LOCALE_CAT_MAX", SWIG_FromInt((int)wxLOCALE_CAT_MAX));
+    PyDict_SetItemString(d,"LOCALE_THOUSANDS_SEP", SWIG_FromInt((int)wxLOCALE_THOUSANDS_SEP));
+    PyDict_SetItemString(d,"LOCALE_DECIMAL_POINT", SWIG_FromInt((int)wxLOCALE_DECIMAL_POINT));
+    PyDict_SetItemString(d,"LOCALE_LOAD_DEFAULT", SWIG_FromInt((int)wxLOCALE_LOAD_DEFAULT));
+    PyDict_SetItemString(d,"LOCALE_CONV_ENCODING", SWIG_FromInt((int)wxLOCALE_CONV_ENCODING));
+    PyDict_SetItemString(d,"CONVERT_STRICT", SWIG_FromInt((int)wxCONVERT_STRICT));
+    PyDict_SetItemString(d,"CONVERT_SUBSTITUTE", SWIG_FromInt((int)wxCONVERT_SUBSTITUTE));
+    PyDict_SetItemString(d,"PLATFORM_CURRENT", SWIG_FromInt((int)wxPLATFORM_CURRENT));
+    PyDict_SetItemString(d,"PLATFORM_UNIX", SWIG_FromInt((int)wxPLATFORM_UNIX));
+    PyDict_SetItemString(d,"PLATFORM_WINDOWS", SWIG_FromInt((int)wxPLATFORM_WINDOWS));
+    PyDict_SetItemString(d,"PLATFORM_OS2", SWIG_FromInt((int)wxPLATFORM_OS2));
+    PyDict_SetItemString(d,"PLATFORM_MAC", SWIG_FromInt((int)wxPLATFORM_MAC));
+    PyDict_SetItemString(d,"IMAGELIST_DRAW_NORMAL", SWIG_FromInt((int)wxIMAGELIST_DRAW_NORMAL));
+    PyDict_SetItemString(d,"IMAGELIST_DRAW_TRANSPARENT", SWIG_FromInt((int)wxIMAGELIST_DRAW_TRANSPARENT));
+    PyDict_SetItemString(d,"IMAGELIST_DRAW_SELECTED", SWIG_FromInt((int)wxIMAGELIST_DRAW_SELECTED));
+    PyDict_SetItemString(d,"IMAGELIST_DRAW_FOCUSED", SWIG_FromInt((int)wxIMAGELIST_DRAW_FOCUSED));
+    PyDict_SetItemString(d,"IMAGE_LIST_NORMAL", SWIG_FromInt((int)wxIMAGE_LIST_NORMAL));
+    PyDict_SetItemString(d,"IMAGE_LIST_SMALL", SWIG_FromInt((int)wxIMAGE_LIST_SMALL));
+    PyDict_SetItemString(d,"IMAGE_LIST_STATE", SWIG_FromInt((int)wxIMAGE_LIST_STATE));

     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
     SWIG_addvarlink(SWIG_globals,(char*)"NORMAL_FONT",_wrap_NORMAL_FONT_get, _wrap_NORMAL_FONT_set);
     SWIG_addvarlink(SWIG_globals,(char*)"SMALL_FONT",_wrap_SMALL_FONT_get, _wrap_SMALL_FONT_set);
     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
     SWIG_addvarlink(SWIG_globals,(char*)"NORMAL_FONT",_wrap_NORMAL_FONT_get, _wrap_NORMAL_FONT_set);
     SWIG_addvarlink(SWIG_globals,(char*)"SMALL_FONT",_wrap_SMALL_FONT_get, _wrap_SMALL_FONT_set);


@@ -17828,7 +19564,8 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"TheBrushList",_wrap_TheBrushList_get, _wrap_TheBrushList_set);
     SWIG_addvarlink(SWIG_globals,(char*)"TheColourDatabase",_wrap_TheColourDatabase_get, _wrap_TheColourDatabase_set);
     
     SWIG_addvarlink(SWIG_globals,(char*)"TheBrushList",_wrap_TheBrushList_get, _wrap_TheBrushList_set);
     SWIG_addvarlink(SWIG_globals,(char*)"TheColourDatabase",_wrap_TheColourDatabase_get, _wrap_TheColourDatabase_set);
     

-    wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
+    // Work around a chicken/egg problem in drawlist.cpp
+    wxPyDrawList_SetAPIPtr();

     
 }
 
     
 }